Changeset 751 for trunk/server/source3/smbd/server_exit.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/smbd/server_exit.c (modified) (4 diffs)

trunk/server/source3/smbd/server_exit.c

@@ -84 +84 @@
         const char *const reason)
 {
-        bool had_open_conn = false;
         struct smbd_server_connection *sconn = smbd_server_conn;
 
@@ -102 +101 @@
                         files_forall(sconn, log_writeable_file_fn, &found);
                 }
-                had_open_conn = conn_close_all(sconn);
+                (void)conn_close_all(sconn);
                 invalidate_all_vuids(sconn);
         }
@@ -176 +175 @@
                 dump_core();
 
+                /* Notreached. */
+                exit(1);
         } else {
                 DEBUG(3,("Server exit (%s)\n",
@@ -185 +186 @@
         }
 
-        /* if we had any open SMB connections when we exited then we
-           need to tell the parent smbd so that it can trigger a retry
-           of any locks we may have been holding or open files we were
-           blocking */
-        if (had_open_conn) {
-                exit(1);
-        } else {
-                exit(0);
-        }
+        exit(0);
 }