Fix warning (bad handler prototype) and fix detection of dns_sd

libraries.
Jeremy.

diff --git a/source/configure.in b/source/configure.in
index 97d9eb0876bbede0f7502f2e39e7b3b8dbd77dfd..601d1a5359203da300146b6d9b4acb9a825943a1 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -5937,7 +5937,7 @@ if test x"$enable_dnssd" != x"no"; then
     AC_CHECK_FUNCS(DNSServiceRegister)
     AC_CHECK_LIB_EXT(dns_sd, DNSSD_LIBS, DNSServiceRegister)
     if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \
-            x"$ac_cv_lib_ext_DNSServiceRegister" != x"yes"; then
+            x"$ac_cv_lib_ext_dns_sd_DNSServiceRegister" != x"yes"; then
        have_dnssd_support=no
     fi
 

diff --git a/source/smbd/dnsregister.c b/source/smbd/dnsregister.c
index c092251feec63169a86d09a8143ab7fd0d292d32..6850d1a9c4d3715cec274634ff2090ffc6000018 100644 (file)
--- a/source/smbd/dnsregister.c
+++ b/source/smbd/dnsregister.c
@@ -65,7 +65,7 @@ void dns_register_close(struct dns_reg_state **dns_state_ptr)
 
 static void dns_register_smbd_retry(struct event_context *ctx,
                                    struct timed_event *te,
-                                   const struct timeval *now,
+                                   struct timeval now,
                                    void *private_data)
 {
        struct dns_reg_state *dns_state = (struct dns_reg_state *)private_data;