Changeset 701 for branches/samba-3.3.x

Timestamp:

May 8, 2012, 6:36:46 PM (13 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.3: Ensure pid file is only deleted by parent smbd (Silvan's fix)

Location:

branches/samba-3.3.x/source

Files:

• build.cmd (modified) (2 diffs)
• build.options (modified) (1 diff)
• smbd/server.c (modified) (1 diff)

branches/samba-3.3.x/source/build.cmd

@@ -28 +28 @@
 
 /* number of make jobs to execute at the same time */
-jobs = "2"
+jobs = "3"
 
 '@echo off'
@@ -85 +85 @@
 build_parms = ""
 
-/* delete the following 7 lines to remove libc switching capability */
+/* delete the following 8 lines to remove libc switching capability */
 select 
+    when pos("065", cmdline)  > 0 then libc = "065"
     when pos("064X", cmdline) > 0 then libc = "064X"
-    when pos("063", cmdline) > 0 then  libc = "063"
-    otherwise libc = "064"
+    when pos("064", cmdline)  > 0 then libc = "064"
+    when pos("063", cmdline)  > 0 then  libc = "063"
+    otherwise libc = "065"
 end
 address cmd "call "libc".cmd"

branches/samba-3.3.x/source/build.options

@@ -1 +1 @@
 MAKE=""
-LIBC="064"
+LIBC="065"
 BRAND="YES"

branches/samba-3.3.x/source/smbd/server.c

@@ -975 +975 @@
 
 #ifdef __OS2__
-        /* On OS/2 - we need to remove the PID file on server exit otherwise we may not be able to restart Samba */
-        char pidFile[1024];
-        slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), "smbd");
-        unlink(pidFile);
+        if (am_parent){
+                /* On OS/2 - we need to remove the PID file on server exit otherwise we may not be able to restart Samba */
+                char pidFile[1024];
+                slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), "smbd");
+                unlink(pidFile);
+        }
 #endif