d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the -N option in manifest mode by using pwcache(3). This also

Browse Source 
speeds up image creation appreciably.

Reviewed by:	marcel
Sponsored by:	DARPA, AFRL
This commit is contained in:
brooks 2013-02-20 15:25:40 +00:00
parent dabbf96e6d
commit 4694fe4330
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.sbin/makefs/mtree.c
View File

@ -508,8 +508,8 @@ read_mtree_keywords(FILE *fp, fsnode *node)
{
char keyword[PATH_MAX];
char *name, *p, *value;
struct group *grent;
struct passwd *pwent;
gid_t gid;
uid_t uid;
struct stat *st, sb;
intmax_t num;
u_long flset, flclr;
@ -585,11 +585,10 @@ read_mtree_keywords(FILE *fp, fsnode *node)
error = ENOATTR;
break;
}
grent = getgrnam(value);
if (grent != NULL)
st->st_gid = grent->gr_gid;
if (gid_from_group(value, &gid) == 0)
st->st_gid = gid;
else
error = errno;
error = EINVAL;
} else
error = ENOSYS;
break;
@ -698,11 +697,10 @@ read_mtree_keywords(FILE *fp, fsnode *node)
error = ENOATTR;
break;
}
pwent = getpwnam(value);
if (pwent != NULL)
st->st_uid = pwent->pw_uid;
if (uid_from_user(value, &uid) == 0)
st->st_uid = uid;
else
error = errno;
error = EINVAL;
} else
error = ENOSYS;
break;