ports/185862: Netatalk3 sig 11 with TM and zeroconf

[Josh Paetzel]

>Number:         185862
>Category:       ports
>Synopsis:       Netatalk3 sig 11 with TM and zeroconf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 18 17:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Josh Paetzel
>Release:        FreeBSD 9.2-RELEASE
>Organization:
FreeNAS
>Environment:
FreeBSD roadrash.ixsystems.com 9.2-RELEASE-p1 FreeBSD 9.2-RELEASE-p1 #0: Sat Nov 16 04:38:22 UTC 2013     root at amd64-builder.pcbsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
afpd bails out with a sig 11 when the following settings are set in afp.conf:

zeroconf = yes (G) # which is the default
timemachine = yes (V)

And netatalk is compiled to use mDNSResponder instead of avahi for zeroconf 
>How-To-Repeat:

>Fix:
Patch attached

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 340194)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	netatalk
 PORTVERSION=	3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
Index: files/patch-etc_afpd_afp_mdns.c
===================================================================
--- files/patch-etc_afpd_afp_mdns.c	(revision 0)
+++ files/patch-etc_afpd_afp_mdns.c	(working copy)
@@ -0,0 +1,34 @@
+--- etc/afpd/afp_mdns.c.orig	2013-10-28 06:43:13.000000000 -0700
++++ etc/afpd/afp_mdns.c	2014-01-17 22:10:59.000000000 -0800
+@@ -37,17 +37,15 @@
+  * Its easier to use asprintf to set the TXT record values
+  */
+ #define TXTRecordPrintf(rec, key, args, ...) {           \
+-        char *str;                                      \
+-        asprintf(&str, args);                           \
++        char str[1024];                                      \
++        sprintf(str, args);                           \
+         TXTRecordSetValue(rec, key, strlen(str), str);  \
+-        free(str);                                      \
+     }
+ #define TXTRecordKeyPrintf(rec, k, var, args, ...) {     \
+-        char *key, *str;                                \
+-        asprintf(&key, k, var);                         \
+-        asprintf(&str, args);                           \
++        char key[1024], str[1024];                                \
++        sprintf(key, k, var);                         \
++        sprintf(str, args);                           \
+         TXTRecordSetValue(rec, key, strlen(str), str);  \
+-        free(str); free(key);                           \
+     }
+ 
+ static struct pollfd *fds;
+@@ -134,7 +132,7 @@
+ 
+     /* Register our service, prepare the TXT record */
+     TXTRecordCreate(&txt_adisk, 0, NULL);
+-    TXTRecordPrintf(&txt_adisk, "sys", "waMa=0,adVF=0x100");
++    TXTRecordPrintf(&txt_adisk, "sys", "waMa=0,adVF=0x100", NULL);
+ 
+     /* Build AFP volumes list */
+     int i = 0;



>Release-Note:
>Audit-Trail:
>Unformatted: