diff options
| author | hauke <hauke> | 2012-05-16 14:03:08 +0000 |
|---|---|---|
| committer | hauke <hauke> | 2012-05-16 14:03:08 +0000 |
| commit | e92d72991f2388029056e1b3534a361c43c7c14f (patch) | |
| tree | e1227ece08efa41f952948362ba55654d42ab2ee /net | |
| parent | 55b96d424662b1d4afc90603b412f3d1f4da4dff (diff) | |
| download | pkgsrc-e92d72991f2388029056e1b3534a361c43c7c14f.tar.gz | |
Avoid a SIGSEGV, when AFPConfigInit() runs into a problem parsing
afpd.conf and returns NULL.
Diffstat (limited to 'net')
| -rw-r--r-- | net/netatalk/distinfo | 3 | ||||
| -rw-r--r-- | net/netatalk/patches/patch-etc_afpd_afp_config.c | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo index f31f981011c..8391664346e 100644 --- a/net/netatalk/distinfo +++ b/net/netatalk/distinfo @@ -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-ar) = 8c6c6169496b9b2cdec6049d2ee45884d5513d11 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 --git a/net/netatalk/patches/patch-etc_afpd_afp_config.c b/net/netatalk/patches/patch-etc_afpd_afp_config.c new file mode 100644 index 00000000000..88510e23371 --- /dev/null +++ b/net/netatalk/patches/patch-etc_afpd_afp_config.c @@ -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); + } |