[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  ac216c1 Fix bug #8047 - mdns registration doesn't work if "interfaces" is used in smb.conf
      from  1272758 s3: Fix Coverity ID 1137: CONSTANT_EXPRESSION_RESULT

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ac216c130e5d1f1c86d7e481838748208bb68f73
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

-----------------------------------------------------------------------

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 e9332c1..1948077 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -681,6 +681,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