diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 11:10:57 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-08-07 11:10:57 +0800 |
| commit | e47e08887c823824bfc36f102c065075737394b1 (patch) | |
| tree | dcbb175cb6ba3204ac55a06d61d28c488227ab4f /cpp/src/IceGrid/RegistryI.cpp | |
| parent | Revert "4171 - Global namespace pollution" (diff) | |
| download | ice-e47e08887c823824bfc36f102c065075737394b1.tar.bz2 ice-e47e08887c823824bfc36f102c065075737394b1.tar.xz ice-e47e08887c823824bfc36f102c065075737394b1.zip | |
Revert "Changes for bug 3962 and 4714"
This reverts commit d38ad95e45c0083d602a43e6d77e6c1599f324fe.
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/RegistryI.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 52086f4651b..73ff0e21a4f 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -9,7 +9,6 @@ #include <IceUtil/DisableWarnings.h> #include <IceUtil/UUID.h> -#include <IceUtil/FileUtil.h> #include <Ice/Ice.h> #include <Ice/Network.h> #include <Ice/ProtocolPluginFacade.h> // Just to get the hostname @@ -43,6 +42,7 @@ #include <openssl/des.h> // For crypt() passwords #include <sys/types.h> +#include <sys/stat.h> #ifdef _WIN32 # include <direct.h> @@ -201,7 +201,8 @@ RegistryI::startImpl() } else { - if(!IceUtilInternal::directoryExists(dbPath)) + struct stat filestat; + if(stat(dbPath.c_str(), &filestat) != 0 || !S_ISDIR(filestat.st_mode)) { Error out(_communicator->getLogger()); SyscallException ex(__FILE__, __LINE__); |