Changeset 755

Timestamp:

Nov 29, 2012, 3:48:54 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.6: remove pid when exiting

Location:

trunk/server/source3

Files:

• lib/pidfile.c (modified) (2 diffs)
• smbd/server_exit.c (modified) (1 diff)

trunk/server/source3/lib/pidfile.c

@@ -43 +43 @@
         /* Add a suffix to the program name if this is a process with a
          * none default configuration file name. */
+        /* On OS/2, CONFIGFILE will always be different to dyn_CONFIGFILE 
+           as dyn_CONFIGFILE dynamically looks up the system ETC directory */    
+#ifndef __OS2__
         if (strcmp( CONFIGFILE, get_dyn_CONFIGFILE()) == 0) {
                 name = SMB_STRDUP(program_name);
@@ -59 +62 @@
                 }
         }
+#else
+        name = SMB_STRDUP(program_name);
+#endif
 
         if (asprintf(&pidFile, "%s/%s.pid", lp_piddir(), name) == -1) {

trunk/server/source3/smbd/server_exit.c

@@ -165 +165 @@
         printing_end();
 
-#ifdef __OS2__
-        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
-
         if (how != SERVER_EXIT_NORMAL) {
                 DEBUGSEP(0);