Changeset 366 for branches/samba-3.0/source/dynconfig.c

Timestamp:

Jan 12, 2010, 7:38:34 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Better fix for hardcoded \lib directory in 3.0.x

File:

• branches/samba-3.0/source/dynconfig.c (modified) (1 diff)

branches/samba-3.0/source/dynconfig.c

@@ -140 +140 @@
  **/
 // we try to set the libdir based on the current running process
-const char* getlibdir()
+const char * getlibdir()
 {
-        static pstring buffer = "";
-        if (!*buffer)
-        {
-
-                if (getenv("SMB_EXE") == NULL)
-                {
-                        snprintf(buffer, 260, "%s", LIBDIR);
-                } else {
-                        snprintf(buffer, 260, "%s/lib", getenv("SMB_EXE"));
-                }
-        }
-
-        return buffer;
+        static pstring buffer = "";
+        if (!*buffer)
+        {
+                pstring exedir = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", LIBDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+        return buffer;
 }