netatalk: fix a crash on Solaris when registering with mDNS

Signed-off-by: Ralph Boehme <rb@sernet.de>

diff --git a/NEWS b/NEWS
index f98e319d180ae1be166c3d3fa69923df435f9570..6ab9cc131af9b2d2302f54468624ebf91eec50fe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Changes in 3.1.7
 ================
 * UPD: Spotlight: enhance behaviour for long running queries, client
        will now show "progress wheel" while waiting for first results.
+* FIX: netatalk: fix a crash on Solaris when registering with mDNS
 
 Changes in 3.1.6
 ================

diff --git a/etc/netatalk/afp_mdns.c b/etc/netatalk/afp_mdns.c
index 65ea55a36e6dd2e4ce7fc60aad907fd5c988f2a9..e29827088d2677c047dd4fb04c07f6928c486947 100644 (file)
--- a/etc/netatalk/afp_mdns.c
+++ b/etc/netatalk/afp_mdns.c
@@ -18,7 +18,6 @@
 
 #include <atalk/logger.h>
 #include <atalk/util.h>
-#include <atalk/dsi.h>
 #include <atalk/unicode.h>
 #include <atalk/netatalk_conf.h>
 
@@ -160,7 +159,6 @@ static void unregister_stuff() {
 static void register_stuff(const AFPObj *obj) {
     uint                                        port;
     const struct vol                *volume;
-    DSI                                         *dsi;
     char                                        name[MAXINSTANCENAMELEN+1];
     DNSServiceErrorType         error;
     TXTRecordRef                        txt_adisk;
@@ -234,8 +232,6 @@ static void register_stuff(const AFPObj *obj) {
         LOG(log_error, logtype_afpd, "Could not set Zeroconf instance name");
         goto fail;
     }
-    LOG(log_info, logtype_afpd, "Registering server '%s' with Bonjour",
-        dsi->bonjourname);
 
     error = DNSServiceRegister(&svc_refs[svc_ref_count++],
                                0,               // no flags
@@ -276,8 +272,8 @@ static void register_stuff(const AFPObj *obj) {
     }
 
     if (obj->options.mimicmodel) {
-        LOG(log_info, logtype_afpd, "Registering server '%s' with model '%s'",
-            dsi->bonjourname, obj->options.mimicmodel);
+        LOG(log_info, logtype_afpd, "Registering server as model '%s'",
+            obj->options.mimicmodel);
         TXTRecordCreate(&txt_devinfo, 0, NULL);
         if ( 0 > TXTRecordPrintf(&txt_devinfo, "model", obj->options.mimicmodel) ) {
             LOG ( log_error, logtype_afpd, "Could not create Zeroconf TXTRecord for model");