summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-03-16 14:48:40 +0100
committerKarolin Seeger <kseeger@samba.org>2009-04-15 09:07:15 +0200
commit1246e1bfc861e2203cd0781afe018c4dbedc033d (patch)
tree8e638360c3096210ddea26f4fa49ceaafbca341e
parent14a84c535719a4c6068c9c2b8a361d2dcfc718d9 (diff)
downloadsamba-1246e1bfc861e2203cd0781afe018c4dbedc033d.tar.gz
samba-1246e1bfc861e2203cd0781afe018c4dbedc033d.tar.xz
samba-1246e1bfc861e2203cd0781afe018c4dbedc033d.zip
s3:smbd: don't exit the parent when we have no connections
This code path can't really happen anymore, because launchd support was removed with commit e5a951325a6cac8567af3a66de6d2df577508ae4. But it's confusing to have that code there... metze (cherry picked from commit 445b37f4f35ff4256c46dbacc2d3b3a1e47e62b2) (cherry picked from commit a527e24b80abf5aeaafdd67db21b5b021d1effe0)
-rw-r--r--source3/smbd/server.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 538e04938e9..2400b5c104e 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -693,13 +693,6 @@ static void smbd_parent_loop(struct smbd_parent_context *parent)
if (num < 0)
exit_server_cleanly("socket error");
- /* If the idle timeout fired and we don't have any connected
- * users, exit gracefully. We should be running under a process
- * controller that will restart us if necessry.
- */
- if (num == 0 && count_all_current_connections() == 0) {
- exit_server_cleanly("idle timeout");
- }
TALLOC_FREE(frame);
} /* end while 1 */