Changeset 689

Timestamp:

Mar 1, 2012, 10:27:21 AM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.3: fixed ticket 192

Location:

branches/samba-3.3.x/source

Files:

• dynconfig.c (modified) (1 diff)
• param/loadparm.c (modified) (3 diffs)

branches/samba-3.3.x/source/dynconfig.c

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

branches/samba-3.3.x/source/param/loadparm.c

@@ -82 +82 @@
 static bool in_client = False;          /* Not in the client by default */
 static struct smbconf_csn conf_last_csn;
+#ifdef __OS2__
+static bool newLockDir = False;
+#endif
 
 #define CONFIG_BACKEND_FILE 0
@@ -4709 +4712 @@
         string_set(&Globals.szPidDir, get_dyn_PIDDIR());
         string_set(&Globals.szLockDir, get_dyn_LOCKDIR());
+#ifdef __OS2__
+        newLockDir = True;
+#endif
         string_set(&Globals.szSocketAddress, "0.0.0.0");
 
@@ -8971 +8977 @@
                 lp_do_parameter(GLOBAL_SECTION_SNUM, "wins server", "127.0.0.1");
         }
+#ifdef __OS2__
+        if (lp_is_in_client() && newLockDir) {
+           char* s=NULL;
+           if (asprintf(&s, "%s/%s", lp_lockdir(), "client") < 0) {
+                smb_panic("init_globals: ENOMEM");
+           }
+           lp_do_parameter(GLOBAL_SECTION_SNUM, "lock directory", s);
+           SAFE_FREE(s);
+           newLockDir = False;
+        }
+#endif
 
         init_iconv();