The branch, v3-2-test has been updated
via 3936de735a7bb548df8ce7f06f2cc8f7ffdf56cd (commit)
from 88102b5b7c4eaad5445e9cb96e547dd918abc0c2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 3936de735a7bb548df8ce7f06f2cc8f7ffdf56cd
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Thu Jan 10 15:15:01 2008 -0800
Don't print out debug messages at level 0 if we can't
bind to a socket if we've already bound to one (this
prevents :
bind failed on port 445 socket_addr = 0.0.0.0.
Error = Address already in use
bind failed on port 139 socket_addr = 0.0.0.0.
Error = Address already in use
messages when trying to bind to an IPv4 address
when we've already bound to the IPv6 equivalent.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/smbd/server.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 43a6d62..8371d17 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -390,8 +390,11 @@ static bool open_sockets_smbd(bool is_daemon, bool
interactive, const char *smb_
}
s = fd_listenset[num_sockets] =
- open_socket_in(SOCK_STREAM, port, 0,
- ifss, True);
+ open_socket_in(SOCK_STREAM,
+ port,
+ num_sockets == 0 ? 0 :
2,
+ ifss,
+ true);
if(s == -1) {
continue;
}
@@ -467,8 +470,11 @@ static bool open_sockets_smbd(bool is_daemon, bool
interactive, const char *smb_
continue;
}
- s = open_socket_in(SOCK_STREAM, port, 0,
- &ss, true);
+ s = open_socket_in(SOCK_STREAM,
+ port,
+ num_sockets == 0 ? 0 : 2,
+ &ss,
+ true);
if (s == -1) {
continue;
}
--
Samba Shared Repository
