Fix a possible crash at startup when registering with Avahi when Avahi is not running

diff --git a/NEWS b/NEWS
index 9df6a08ee09b30901ae9efcef112b653e69b4e0c..c76b347b4cca5d5b2c2246746f487199d71ee2bd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ Changes in 2.2.1
 * FIX: afpd: fix a crash when searching for a UUID that is not a special
        local UUID and LDAP support is not compiled in
 * FIX: afpd: .volinfo file not created on first volume access if user in rolist
+* FIX: afpd: possible crash at startup when registering with Avahi when Avahi is
+       not running
 * FIX: cnid_dbd: increase BerkeleyDB locks and lockobjs
 * FIX: cnid_dbd: implement -d option, deletes CNID db
 * FIX: suse: initscript return better status

diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
index f34b8806b0a2a9c202928eda9d0a89c06bad953c..b564c4734b9a6398e353e650414eb9b8e158dc5d 100644 (file)
--- a/etc/afpd/afp_avahi.c
+++ b/etc/afpd/afp_avahi.c
@@ -306,7 +306,7 @@ void av_zeroconf_setup(const AFPConfig *configs) {
                                          NULL,
                                          &error))) {
         LOG(log_error, logtype_afpd, "Failed to create client object: %s",
-            avahi_strerror(avahi_client_errno(ctx->client)));
+            avahi_strerror(error));
         goto fail;
     }