Changeset 221 for branches/samba-3.3.x/source/smbd/server.c

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/smbd/server.c (modified) (2 diffs)

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

@@ -300 +300 @@
                    if they can grab any of the pending locks
                 */
-                DEBUG(3,(__location__ " Unclean shutdown of pid %u\n", pid));
+                DEBUG(3,(__location__ " Unclean shutdown of pid %u\n", (unsigned int)pid));
                 messaging_send_buf(smbd_messaging_context(), procid_self(), 
                                    MSG_SMB_BRL_VALIDATE, NULL, 0);
@@ -1439 +1439 @@
 
         if (*lp_rootdir()) {
-                if (sys_chroot(lp_rootdir()) == 0)
-                        DEBUG(2,("Changed root to %s\n", lp_rootdir()));
+                if (sys_chroot(lp_rootdir()) != 0) {
+                        DEBUG(0,("Failed to change root to %s\n", lp_rootdir()));
+                        exit(1);
+                }
+                if (chdir("/") == -1) {
+                        DEBUG(0,("Failed to chdir to / on chroot to %s\n", lp_rootdir()));
+                        exit(1);
+                }
+                DEBUG(0,("Changed root to %s\n", lp_rootdir()));
         }