Support for using $u username variable in AFP volume definitions

[netatalk.git] / etc / afpd / afp_zeroconf.c

diff --git a/etc/afpd/afp_zeroconf.c b/etc/afpd/afp_zeroconf.c
index 84f187126340dd1664274106f08dc4765c167688..cf370fc3bf4b052a5defd159dcc40749fcc2bb2b 100644 (file)
--- a/etc/afpd/afp_zeroconf.c
+++ b/etc/afpd/afp_zeroconf.c
@@ -14,7 +14,9 @@
 #include "afp_zeroconf.h"
 #include "afp_config.h"
 
-#ifdef HAVE_AVAHI
+#ifdef HAVE_MDNS
+#include "afp_mdns.h"
+#elif defined (HAVE_AVAHI)
 #include "afp_avahi.h"
 #endif
 
@@ -22,20 +24,26 @@
 /*
  * Functions (actually they are just facades)
  */
-void zeroconf_register(const AFPConfig *configs)
+void zeroconf_register(const AFPObj *configs)
 {
-#if defined (HAVE_AVAHI)
+#if defined (HAVE_MDNS)
+  LOG(log_debug, logtype_afpd, "Attempting to register with mDNS using mDNSResponder");
+
+       md_zeroconf_register(configs);
+#elif defined (HAVE_AVAHI)
   LOG(log_debug, logtype_afpd, "Attempting to register with mDNS using Avahi");
 
-       av_zeroconf_setup(configs);
-  av_zeroconf_run();
+       av_zeroconf_register(configs);
 #endif
 }
 
 void zeroconf_deregister(void)
 {
-#if defined (HAVE_AVAHI)
+#if defined (HAVE_MDNS)
+  LOG(log_debug, logtype_afpd, "Attempting to de-register mDNS using mDNSResponder");
+       md_zeroconf_unregister();
+#elif defined (HAVE_AVAHI)
   LOG(log_debug, logtype_afpd, "Attempting to de-register mDNS using Avahi");
-       av_zeroconf_shutdown();
+       av_zeroconf_unregister();
 #endif
 }