diff options
| author | Jeremy Allison <jra@samba.org> | 2009-09-08 17:22:39 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-01-13 14:01:06 +0100 |
| commit | 5f0f1fff7552254023a712daacd40faacb35130e (patch) | |
| tree | eda9f5147e44643f507a41d452e224019625480c | |
| parent | 31d45ea2091222fac27b82df7e69fdd5bbe375d6 (diff) | |
| download | samba-5f0f1fff7552254023a712daacd40faacb35130e.tar.gz samba-5f0f1fff7552254023a712daacd40faacb35130e.tar.xz samba-5f0f1fff7552254023a712daacd40faacb35130e.zip | |
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.
(cherry picked from commit b87c794f99d7909e907b1d115c317bebd55984ed)
| -rw-r--r-- | source/smbd/server.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/smbd/server.c b/source/smbd/server.c index e0f86a6b7ca..51294847307 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); |