[SCM] Samba Shared Repository - branch v3-6-test updated
Jeremy Allison
jra at samba.org
Fri Apr 1 15:57:42 MDT 2011
The branch, v3-6-test has been updated
via 8421f04 Fix bug #8047 - mdns registration doesn't work if "interfaces" is used in smb.conf
from 2b4ddf3 s3-winbindd: Use the correct enums for samr_QueryDomainInfo. (cherry picked from commit d9ad60f0dc40be1e1d533f96ec0032e01035d85b)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 8421f046512c958ddb79f7ee8552dedfc870350b
Author: Marc A. Dahlhaus <mad at wol.de>
Date: Fri Apr 1 13:26:31 2011 -0700
Fix bug #8047 - mdns registration doesn't work if "interfaces" is used in smb.conf
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Fri Apr 1 23:15:34 CEST 2011 on sn-devel-104
(cherry picked from commit ac216c130e5d1f1c86d7e481838748208bb68f73)
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/server.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e8c1169..da95b45 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -677,6 +677,13 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
continue;
}
+ /* Keep the first port for mDNS service
+ * registration.
+ */
+ if (dns_port == 0) {
+ dns_port = port;
+ }
+
if (!smbd_open_one_socket(parent, ifss, port)) {
return false;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list