From owner-svn-src-projects@FreeBSD.ORG  Sun Dec 30 01:32:16 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 85FACFF3;
 Sun, 30 Dec 2012 01:32:16 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6B5B88FC0C;
 Sun, 30 Dec 2012 01:32:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBU1WGOd091446;
 Sun, 30 Dec 2012 01:32:16 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBU1WGj1091445;
 Sun, 30 Dec 2012 01:32:16 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212300132.qBU1WGj1091445@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Sun, 30 Dec 2012 01:32:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244849 - projects/mtree/tools/build
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Dec 2012 01:32:16 -0000

Author: brooks
Date: Sun Dec 30 01:32:15 2012
New Revision: 244849
URL: http://svnweb.freebsd.org/changeset/base/244849

Log:
  Make the gid_from_group and uid_from_user stubs actually work so install
  works as expected.  We may yet want to implement user and group cache
  support so -N works and we can eliminate the need to bootstrap new
  user entries in passwd and groups.

Modified:
  projects/mtree/tools/build/pwcache-stub.c

Modified: projects/mtree/tools/build/pwcache-stub.c
==============================================================================
--- projects/mtree/tools/build/pwcache-stub.c	Sun Dec 30 00:58:37 2012	(r244848)
+++ projects/mtree/tools/build/pwcache-stub.c	Sun Dec 30 01:32:15 2012	(r244849)
@@ -29,13 +29,13 @@
  */
 
 #include <sys/cdefs.h>
+#include <sys/param.h>
+
+#include <grp.h>
 #include <pwd.h>
 
 __FBSDID("$FreeBSD$");
 
-struct group;
-struct passwd;
-
 int
 pwcache_groupdb(
 	int		(*a_setgroupent)(int) __unused,
@@ -59,15 +59,23 @@ pwcache_userdb(
 }
 
 int
-gid_from_group(const char *group __unused, gid_t *gid __unused)
+gid_from_group(const char *group, gid_t *gid)
 {
-
-	return (-1);
+	struct group *grp;
+	
+	if ((grp = getgrnam(group)) == NULL)
+		return (-1);
+	*gid = grp->gr_gid;
+	return (0);
 }
 
 int
-uid_from_user(const char *user __unused, uid_t *uid __unused)
+uid_from_user(const char *user, uid_t *uid)
 {
+	struct passwd *pwd;
 
-	return(-1);
+	if ((pwd = getpwnam(user)) == NULL)
+		return(-1);
+	*uid = pwd->pw_uid;
+	return(0);
 }