diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-03-24 10:53:06 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-03-24 10:53:06 +1100 |
commit | 0e3339a46b1747156f35d136dbbc93b503b85b1c (patch) | |
tree | 783aafc4b94db5ba1be889cbe4b44363dfee5d54 /source3/smbd/server.c | |
parent | 7f113904eba5361d963075bcea7e36fd98ca34aa (diff) | |
parent | 36b957b5b7a1f70e39eeef224820739f24b999c9 (diff) | |
download | samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.tar.gz samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.tar.bz2 samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/smbd/server.c')
-rw-r--r-- | source3/smbd/server.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index d27f98281b..67836f785b 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -643,8 +643,19 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, #endif if (dns_port != 0) { +#ifdef WITH_DNSSD_SUPPORT smbd_setup_mdns_registration(smbd_event_context(), parent, dns_port); +#endif +#ifdef WITH_AVAHI_SUPPORT + void *avahi_conn; + + avahi_conn = avahi_start_register( + smbd_event_context(), smbd_event_context(), dns_port); + if (avahi_conn == NULL) { + DEBUG(10, ("avahi_start_register failed\n")); + } +#endif } return true; |