Changeset 363

Timestamp:

Jan 7, 2010, 4:12:19 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fix for hardcoded \lib directory in 3.0.x

Location:

branches/samba-3.0/source

Files:

• dynconfig.c (modified) (1 diff)
• include/dynconfig.h (modified) (2 diffs)
• include/version.h (modified) (1 diff)
• lib/os2ea.c (modified) (1 diff)

branches/samba-3.0/source/dynconfig.c

@@ -139 +139 @@
  * @sa lib_path() to get the path to a file inside the LIBDIR.
  **/
-pstring dyn_LIBDIR = LIBDIR;
+// we try to set the libdir based on the current running process
+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;
+}
+
 fstring dyn_SHLIBEXT = SHLIBEXT;
 

branches/samba-3.0/source/include/dynconfig.h

@@ -37 +37 @@
 #define dyn_SMB_PASSWD_FILE (getsmbpasswd())
 #define dyn_LMHOSTSFILE (getlmhosts())
+#define dyn_LIBDIR (getlibdir())
 #else
 extern pstring dyn_CONFIGFILE;
@@ -44 +45 @@
 extern pstring dyn_SMB_PASSWD_FILE;
 extern pstring dyn_PRIVATE_DIR;
+extern pstring dyn_LIBDIR;
 #endif /* __OS2__ */
 extern fstring dyn_SHLIBEXT;
-extern pstring dyn_LIBDIR;
 

branches/samba-3.0/source/include/version.h

@@ -4 +4 @@
 #define SAMBA_VERSION_RELEASE 37
 #define SAMBA_VERSION_OFFICIAL_STRING "3.0.37"
-#define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.0.3"
-#define SAMBA_VERSION_VENDOR_PATCH 354
+#define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.0.x-EA-TEST-DYN"
+#define SAMBA_VERSION_VENDOR_PATCH 355
 #define SAMBA_VERSION_STRING samba_version_string()

branches/samba-3.0/source/lib/os2ea.c

@@ -382 +382 @@
                 if (pfea->oNextEntryOffset > 0x10000)
                 {
-                        DEBUG(0, ("Broken Extended Attributes detected for: %s:%d\n", path ? path : "null", file));
+                        // DEBUG(0, ("Broken Extended Attributes detected for: %s:%d\n", path ? path : "null", file));
+                        DEBUG(0, ("Broken Extended Attributes detected for: %s:%d, Last EA:%s\n", path ? path : "null", file, pfea->szName));
                         break;
                 }