Changeset 223 for branches/samba-3.3.x/source/smbd/server.c

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/smbd/server.c (modified) (2 diffs)

branches/samba-3.3.x/source/smbd/server.c

@@ -588 +588 @@
                            MSG_SMB_INJECT_FAULT, msg_inject_fault);
 #endif
+
+        /* Kick off our mDNS registration. */
+        if (dns_port != 0) {
+#ifdef WITH_DNSSD_SUPPORT
+                dns_register_smbd(&dns_reg, dns_port, &maxfd,
+                                  &r_fds, &idle_timeout);
+#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
+        }
 
         /* now accept incoming connections - forking a new process
@@ -632 +649 @@
                 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,