[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-112-g2ec6224
Jeremy Allison
jra at samba.org
Thu Oct 25 21:18:04 GMT 2007
The branch, v3-2-test has been updated
via 2ec6224b552ef86fa1739c9e396c39c7ec6c76c6 (commit)
from 11a977aa0757801fb0fa805b123e7bc75c8be447 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 2ec6224b552ef86fa1739c9e396c39c7ec6c76c6
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 25 14:11:35 2007 -0700
Ensure we don't terminate if we fail to bind to a socket,
only fail if we can't bind to any socket.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/smbd/server.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 0a292bc..abad0ef 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -435,7 +435,7 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
s = open_socket_in(SOCK_STREAM, port, 0,
&ss, true);
if (s == -1) {
- return false;
+ continue;
}
/* ready to listen */
@@ -471,6 +471,11 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
SAFE_FREE(ports);
+ if (num_sockets == 0) {
+ DEBUG(0,("open_sockets_smbd: No "
+ "sockets available to bind to.\n"));
+ return false;
+ }
/* Setup the main smbd so that we can get messages. Note that
do this after starting listening. This is needed as when in
--
Samba Shared Repository
More information about the samba-cvs
mailing list