Changeset 366

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

Location:

branches/samba-3.0/source

Files:

• Makefile.in (modified) (1 diff)
• dynconfig.c (modified) (1 diff)
• lib/interface.c (modified) (1 diff)
• lib/os2ea.c (modified) (1 diff)
• lib/os2path.c (added)
• lib/util_unistr.c (modified) (4 diffs)

branches/samba-3.0/source/Makefile.in

@@ -241 +241 @@
           lib/interface.o lib/md4.o \
           lib/interfaces.o lib/pidfile.o \
-          lib/signal.o lib/system.o lib/os2ea.o lib/sendfile.o lib/time.o \
+          lib/signal.o lib/system.o lib/os2ea.o lib/os2path.o lib/sendfile.o lib/time.o \
           lib/ufc.o lib/genrand.o lib/username.o \
           lib/util_pw.o lib/access.o lib/smbrun.o \

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;
 }
 

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

@@ -186 +186 @@
         /* probe the kernel for interfaces */
         total_probed = get_interfaces(ifaces, MAX_INTERFACES);
-        DEBUG(2, ("Anzahl interfaces %i ", total_probed));
+        DEBUG(2, ("interfaces added %i\n", total_probed));
 
         if (total_probed > 0) {

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, Last EA:%s\n", path ? path : "null", file, pfea->szName));
+                        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;
                 }

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

@@ -96 +96 @@
                                                0x20000);
         lowcase_table_use_unmap = ( lowcase_table != NULL );
+        
 
 #ifdef HAVE_SETLOCALE
@@ -113 +114 @@
            not available */
         if (!upcase_table) {
+#ifdef __OS2__
+                DEBUG(1,("could not load %s",lib_path("upcase.dat")));
+#endif          
                 DEBUG(1,("creating lame upcase table\n"));
+
                 upcase_table = (smb_ucs2_t *)SMB_MALLOC(0x20000);
                 for (i=0;i<0x10000;i++) {
@@ -128 +133 @@
 
         if (!lowcase_table) {
+#ifdef __OS2__
+                DEBUG(1,("could not load %s\n",lib_path("lowcase.dat")));
+#endif
                 DEBUG(1,("creating lame lowcase table\n"));
+
                 lowcase_table = (smb_ucs2_t *)SMB_MALLOC(0x20000);
                 for (i=0;i<0x10000;i++) {
@@ -248 +257 @@
         /* use free rather than unmap */
         valid_table_use_unmap = False;
-
-        DEBUG(2,("creating default valid table\n"));
+#ifdef __OS2__
+        DEBUG(1,("could not load %s\n",lib_path("valid.dat")));
+#endif  
+        DEBUG(1,("creating default valid table\n"));
+
         valid_table = (uint8 *)SMB_MALLOC(0x10000);
         for (i=0;i<128;i++) {