[pkgsrc/trunk]: pkgsrc/net/netatalk Avoid a SIGSEGV, when AFPConfigInit() run...

[hauke <hauke%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ea2160b93ea4
branches:  trunk
changeset: 603894:ea2160b93ea4
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Wed May 16 14:03:08 2012 +0000

description:
Avoid a SIGSEGV, when AFPConfigInit() runs into a problem parsing
afpd.conf and returns NULL.

diffstat:

 net/netatalk/distinfo                            |   3 ++-
 net/netatalk/patches/patch-etc_afpd_afp_config.c |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 23e6cd9405ef -r ea2160b93ea4 net/netatalk/distinfo
--- a/net/netatalk/distinfo     Wed May 16 13:49:22 2012 +0000
+++ b/net/netatalk/distinfo     Wed May 16 14:03:08 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2012/05/12 21:53:20 dholland Exp $
+$NetBSD: distinfo,v 1.46 2012/05/16 14:03:08 hauke Exp $
 
 SHA1 (netatalk-2.2.1.tar.bz2) = e588b89eced7769f65e213bc4b1b1e4f8035c8b3
 RMD160 (netatalk-2.2.1.tar.bz2) = bc55a591fe134d3bf05ca442aa5b5246fd766b8c
@@ -17,5 +17,6 @@
 SHA1 (patch-au) = 8505351fee21ac1effa4dc620b8006c572b913c1
 SHA1 (patch-bj) = abbc2809b6b7fe75ec2d2f8f2fa8d6cd9d6de7b0
 SHA1 (patch-bk) = c3fb7c3a42f148171fa99b6121b099dd4998947a
+SHA1 (patch-etc_afpd_afp_config.c) = 37813324c503fae05af12dba8dad5741a21ea4ed
 SHA1 (patch-etc_afpd_quota_c) = 5005abb6528c0b3160a587fbe9fb285f485e6759
 SHA1 (patch-macros_quota-check.m4) = b1484f83a2a6ba5bd50623ab525d5366bb71abaa
diff -r 23e6cd9405ef -r ea2160b93ea4 net/netatalk/patches/patch-etc_afpd_afp_config.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/netatalk/patches/patch-etc_afpd_afp_config.c  Wed May 16 14:03:08 2012 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-etc_afpd_afp_config.c,v 1.1 2012/05/16 14:03:08 hauke Exp $
+
+Avoid a SIGSEGV when AFPConfigInit() runs into a problem and returns NULL.
+
+--- etc/afpd/afp_config.c.orig 2011-07-22 04:30:42.000000000 +0000
++++ etc/afpd/afp_config.c
+@@ -591,7 +591,7 @@ AFPConfig *configinit(struct afp_options
+         first = AFPConfigInit(cmdline, cmdline);
+ 
+     /* Now register with zeroconf, we also need the volumes for that */
+-    if (! (first->obj.options.flags & OPTION_NOZEROCONF)) {
++    if (first != NULL && ! (first->obj.options.flags & OPTION_NOZEROCONF)) {
+         load_volumes(&first->obj);
+         zeroconf_register(first);
+     }