diff options
| author | bouyer <bouyer@pkgsrc.org> | 2011-08-30 15:09:22 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2011-08-30 15:09:22 +0000 |
| commit | 2963242d310beb859930f1114d336531a78a412e (patch) | |
| tree | 7d1ded23454dd8b34ed0cbff534399d60a2f2557 /net | |
| parent | b1844533a8ba055b06f6c42c9fcaffcd7221e374 (diff) | |
| download | pkgsrc-2963242d310beb859930f1114d336531a78a412e.tar.gz | |
PR pkg/45300 net/netatalk patch-at seems broken
Don't seteuid() to a gid. Always pass the uid in addition to the quota id
to getfreespace() so we can properly seteuid().
bump PKGREVISION
Diffstat (limited to 'net')
| -rw-r--r-- | net/netatalk/Makefile | 4 | ||||
| -rw-r--r-- | net/netatalk/distinfo | 4 | ||||
| -rw-r--r-- | net/netatalk/patches/patch-at | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 56e840fe7f8..9816dc47a66 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.76 2011/04/22 13:44:26 obache Exp $ +# $NetBSD: Makefile,v 1.77 2011/08/30 15:09:22 bouyer Exp $ DISTNAME= netatalk-2.1.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} EXTRACT_SUFX= .tar.bz2 diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo index 846f02a3d72..f4169a522bb 100644 --- a/net/netatalk/distinfo +++ b/net/netatalk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2011/04/11 20:22:59 markd Exp $ +$NetBSD: distinfo,v 1.40 2011/08/30 15:09:22 bouyer Exp $ SHA1 (netatalk-2.1.5.tar.bz2) = 689856ed96ccf34f2f7b83d70c97d30213638a70 RMD160 (netatalk-2.1.5.tar.bz2) = 9265b34f303a21b89c78401c24ed464c61041ff3 @@ -18,7 +18,7 @@ SHA1 (patch-ap) = c5e7cc0e1773d7e60106df7e1f3ded234308bb8c SHA1 (patch-aq) = 15eea1ce4d9721cfa29959990ee014f623f816a0 SHA1 (patch-ar) = 42e58ab5b4fb4f79b6dfbc6f0f56e4f00821739c SHA1 (patch-as) = db1b120beb2311959b9d012a3d2e13231f59f137 -SHA1 (patch-at) = 02946db1ffc6eccc1f7925461c39000c0d0845f2 +SHA1 (patch-at) = 556dd188e4fbdb095f85ba9d658a3c102adadd24 SHA1 (patch-au) = cff38d7d61af4ee260cead2c741f6aae07be3ddd SHA1 (patch-bj) = e1e0fc2be101554a2e0d53c24d113b593556eb41 SHA1 (patch-include_atalk_dsi.h) = 77c16e42758f1b7db9daadb040337c2c23830c12 diff --git a/net/netatalk/patches/patch-at b/net/netatalk/patches/patch-at index c8e21fb5e8f..910f16218ad 100644 --- a/net/netatalk/patches/patch-at +++ b/net/netatalk/patches/patch-at @@ -1,4 +1,4 @@ -$NetBSD: patch-at,v 1.5 2011/03/26 18:45:52 bouyer Exp $ +$NetBSD: patch-at,v 1.6 2011/08/30 15:09:23 bouyer Exp $ --- etc/afpd/quota.c.orig 2011-03-24 15:43:48.000000000 +0100 +++ etc/afpd/quota.c 2011-03-24 17:56:34.000000000 +0100 @@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.5 2011/03/26 18:45:52 bouyer Exp $ + +static int +getfreespace(struct vol *vol, VolSpace *bfree, VolSpace *btotal, -+ uid_t uid, const char *classq) ++ uid_t ouruid, uid_t quid, const char *classq) +{ + int retq; + struct ufs_quota_entry ufsq[QUOTA_NLIMITS]; @@ -28,11 +28,11 @@ $NetBSD: patch-at,v 1.5 2011/03/26 18:45:52 bouyer Exp $ + strerror(errno)); + return -1; + } -+ if ((retq = getfsquota(vol->v_path, ufsq, uid, classq)) < 0) { ++ if ((retq = getfsquota(vol->v_path, ufsq, quid, classq)) < 0) { + LOG(log_info, logtype_afpd, "getfsquota(%s, %s): %s", + vol->v_path, classq, strerror(errno)); + } -+ seteuid( uid ); ++ seteuid( ouruid ); + if (retq < 1) + return retq; + @@ -60,12 +60,12 @@ $NetBSD: patch-at,v 1.5 2011/03/26 18:45:52 bouyer Exp $ + VolSpace ubfree, ubtotal; + VolSpace gbfree, gbtotal; + -+ uretq = getfreespace(vol, &ubfree, &ubtotal, ++ uretq = getfreespace(vol, &ubfree, &ubtotal, uuid, + uuid, QUOTADICT_CLASS_USER); + LOG(log_info, logtype_afpd, "getfsquota(%s): %d %d", + vol->v_path, (int)ubfree, (int)ubtotal); + if (ngroups >= 1) { -+ gretq = getfreespace(vol, &ubfree, &ubtotal, ++ gretq = getfreespace(vol, &ubfree, &ubtotal, uuid, + groups[0], QUOTADICT_CLASS_GROUP); + } else + gretq = -1; |