Changeset 776

Timestamp:

Jul 11, 2013, 5:58:35 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: remove removing pid, add an important return

Location:

branches/samba-3.5.x

Files:

• lib/tdb/common/lock.c (modified) (1 diff)
• source3/smbd/server.c (modified) (1 diff)

branches/samba-3.5.x/lib/tdb/common/lock.c

@@ -255 +255 @@
                 return -1;
         }
+#endif
         return 0;
-#endif
+
 }
 

branches/samba-3.5.x/source3/smbd/server.c

@@ -897 +897 @@
         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
         /*
          * we need to force the order of freeing the following,