Changeset 754

Timestamp:

Nov 29, 2012, 2:57:00 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.6: remove pid when exiting

Location:

trunk/server

Files:

• lib/replace/poll.c (modified) (1 diff)
• source3/smbd/server_exit.c (modified) (1 diff)

trunk/server/lib/replace/poll.c

@@ -37 +37 @@
 #include <sys/ioctl.h>
 #endif
+
 
 int rep_poll(struct pollfd *fds, nfds_t nfds, int timeout)

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