Changeset 483

Timestamp:

Aug 16, 2010, 1:18:20 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: fixed ticket 144

Location:

trunk/server/source3

Files:

• dynconfig.c (modified) (1 diff)
• lib/os2helper.c (modified) (3 diffs)

trunk/server/source3/dynconfig.c

@@ -297 +297 @@
         if (!*buffer)
         {
-                snprintf(buffer, 260, "%s/samba/lock", getenv("ETC"));
+                if (os2_isClient())
+                {
+                        snprintf(buffer, 260, "%s/samba/lock/client", getenv("ETC"));
+                } else {
+                        snprintf(buffer, 260, "%s/samba/lock", getenv("ETC"));
+                }
         }
         if (dyn_LOCKDIR == NULL) {

trunk/server/source3/lib/os2helper.c

@@ -96 +96 @@
 }
 
-// we search the path of the .exe and return it
-int os2_GetExePath(char *buff)
+// get the exe name (including path)
+bool os2_GetExeName(char *sExeName)
 {
         APIRET rc = NO_ERROR;
-        PPIB ppib = NULL;
-        char sExePath [_MAX_PATH];
-        char sDrive [_MAX_PATH], sDir [_MAX_DIR]; 
+        PPIB ppib = NULL; 
 
         // we search for the infoblock to get the module name
@@ -108 +106 @@
         if (rc != NO_ERROR)
         {
-                return -1;
+                return false;
         }
 
         // with the module name we get the path (including the exe name)
-        rc = DosQueryModuleName(ppib->pib_hmte, sizeof(sExePath), sExePath);
+        rc = DosQueryModuleName(ppib->pib_hmte, sizeof(sExeName), sExeName);
         if (rc != NO_ERROR)
         {
-                return -1;
-        }
+                return false;
+        }
+        return true;
+}
+
+// we search the path of the .exe and return it
+int os2_GetExePath(char *buff)
+{
+        char sExeName [_MAX_PATH];
+        char sDrive [_MAX_PATH], sDir [_MAX_DIR]; 
+
+        if (!os2_GetExeName(sExeName))
+                return false;
 
         // we split to the different values
-        _splitpath(sExePath, sDrive, sDir, NULL, NULL);
+        _splitpath(sExeName, sDrive, sDir, NULL, NULL);
         // strcat(sDrive, sDir);
         strncat(sDrive, sDir, strlen(sDir) -1);
@@ -125 +134 @@
 
         return 0;
+}
+
+// we search with the exe name if we are in client mode
+bool os2_isClient()
+{
+        char sExeName [_MAX_PATH];
+        char sDrive [_MAX_PATH], sDir [_MAX_DIR], sName[_MAX_PATH]; 
+
+        if (!os2_GetExeName(sExeName))
+                return false;
+
+        // we split to the different values
+        _splitpath(sExeName, sDrive, sDir, sName, NULL);
+        if ( (stricmp(sName, "NDCTL") == 0) || (stricmp(sName, "EVFSCTL") == 0) )
+        {
+                return true;
+        } else  {
+                return false;
+        }
 }