[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  b6ce892... s3:smbd: Fix bug 6696
       via  b87c794... Second part of fix for bug 6696 - smbd 3.3.7 crashes (signal 11) in dns_register_smbd_reply. Restore the code from 3.2 that actually initializes the struct dns_reg_state handle. Jeremy.
      from  9bd9575... Re-fix bug 5202 - cannot change ACLs on writable file with "dos filemode=yes"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit b6ce8928e88d92c5a5d703b52e6dc95a5c79d732
Author: Timothy Miller <theosib at gmail.com>
Date:   Mon Sep 7 12:01:58 2009 +0200

    s3:smbd: Fix bug 6696
    
    smbd crashes when using mdns (not avahi) support

commit b87c794f99d7909e907b1d115c317bebd55984ed
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Sep 8 17:22:39 2009 -0700

    Second part of fix for bug 6696 - smbd 3.3.7 crashes (signal 11) in dns_register_smbd_reply. Restore the code from 3.2 that actually initializes the struct dns_reg_state handle. Jeremy.

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

Summary of changes:
 source/smbd/dnsregister.c |    2 +-
 source/smbd/server.c      |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/dnsregister.c b/source/smbd/dnsregister.c
index ff9be43..f02739e 100644
--- a/source/smbd/dnsregister.c
+++ b/source/smbd/dnsregister.c
@@ -168,7 +168,7 @@ bool dns_register_smbd_reply(struct dns_reg_state *dns_state,
 {
 	int mdnsd_conn_fd = -1;
 
-	if (dns_state->srv_ref == NULL) {
+	if ((dns_state == NULL) || (dns_state->srv_ref == NULL)) {
 		return false;
 	}
 
diff --git a/source/smbd/server.c b/source/smbd/server.c
index e0f86a6..5129484 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -652,6 +652,12 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
 		FD_ZERO(&w_fds);
 		GetTimeOfDay(&now);
 
+                /* Kick off our mDNS registration. */
+                if (dns_port != 0) {
+                        dns_register_smbd(&dns_reg, dns_port, &maxfd,
+                                        &r_fds, &idle_timeout);
+                }
+
 		event_add_to_select_args(smbd_event_context(), &now,
 					 &r_fds, &w_fds, &idle_timeout,
 					 &maxfd);


-- 
Samba Shared Repository