Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id CE5EC7A263 for ; Sun, 12 Mar 2017 06:52:24 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 806238563B; Sun, 12 Mar 2017 06:52:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 106408561E for ; Sun, 12 Mar 2017 06:52:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 9JF55nsQk51M for ; Sun, 12 Mar 2017 06:52:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 98D138557D for ; Sun, 12 Mar 2017 06:52:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9211FFBE4; Sun, 12 Mar 2017 06:52:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148930154374870" MIME-Version: 1.0 Date: Sun, 12 Mar 2017 06:52:23 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/archivers/libarchive/files/libarchive To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20170312065223.9211FFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148930154374870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sun Mar 12 06:52:23 UTC 2017 Modified Files: pkgsrc/archivers/libarchive/files/libarchive: archive_read_disk_entry_from_file.c Log Message: Merge 1a1be097da6c042a83fff26bdce361101bb869c8: Darwin ACL: avoid unnecessary use of getpwuuid() and getgruuid() To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148930154374870 Content-Disposition: inline Content-Length: 1648 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.9 --- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.8 Sun Mar 12 06:48:36 2017 +++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c Sun Mar 12 06:52:23 2017 @@ -40,8 +40,6 @@ __FBSDID("$FreeBSD: head/lib/libarchive/ #endif #ifdef HAVE_DARWIN_ACL #include -#include -#include #endif #ifdef HAVE_SYS_EXTATTR_H #include @@ -856,8 +854,6 @@ static int translate_guid(struct archive void *q; uid_t ugid; int r, idtype; - struct passwd *pwd; - struct group *grp; q = acl_get_qualifier(acl_entry); if (q == NULL) @@ -869,24 +865,12 @@ static int translate_guid(struct archive } if (idtype == ID_TYPE_UID) { *ae_tag = ARCHIVE_ENTRY_ACL_USER; - pwd = getpwuuid(q); - if (pwd == NULL) { - *ae_id = ugid; - *ae_name = NULL; - } else { - *ae_id = pwd->pw_uid; - *ae_name = archive_read_disk_uname(a, *ae_id); - } + *ae_id = ugid; + *ae_name = archive_read_disk_uname(a, *ae_id); } else if (idtype == ID_TYPE_GID) { *ae_tag = ARCHIVE_ENTRY_ACL_GROUP; - grp = getgruuid(q); - if (grp == NULL) { - *ae_id = ugid; - *ae_name = NULL; - } else { - *ae_id = grp->gr_gid; - *ae_name = archive_read_disk_gname(a, *ae_id); - } + *ae_id = ugid; + *ae_name = archive_read_disk_gname(a, *ae_id); } else r = 1; --_----------=_148930154374870--