Don't try to do uid or gid lookups from a supplied spec file if -W is given;

the numerical IDs won't be used anyway.
This commit is contained in:
tv 2001-10-31 20:41:17 +00:00
parent 159a2b871c
commit 8e97329393

View File

@ -1,4 +1,4 @@
/* $NetBSD: spec.c,v 1.36 2001/10/26 16:01:46 lukem Exp $ */ /* $NetBSD: spec.c,v 1.37 2001/10/31 20:41:17 tv Exp $ */
/*- /*-
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -74,7 +74,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95";
#else #else
__RCSID("$NetBSD: spec.c,v 1.36 2001/10/26 16:01:46 lukem Exp $"); __RCSID("$NetBSD: spec.c,v 1.37 2001/10/31 20:41:17 tv Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -395,9 +395,11 @@ set(char *t, NODE *ip)
mtree_err("invalid gid `%s'", val); mtree_err("invalid gid `%s'", val);
break; break;
case F_GNAME: case F_GNAME:
if (!Wflag) {
if (gid_from_group(val, &gid) == -1) if (gid_from_group(val, &gid) == -1)
mtree_err("unknown group `%s'", val); mtree_err("unknown group `%s'", val);
ip->st_gid = gid; ip->st_gid = gid;
}
break; break;
case F_IGN: case F_IGN:
/* just set flag bit */ /* just set flag bit */
@ -458,9 +460,11 @@ set(char *t, NODE *ip)
mtree_err("invalid uid `%s'", val); mtree_err("invalid uid `%s'", val);
break; break;
case F_UNAME: case F_UNAME:
if (!Wflag) {
if (uid_from_user(val, &uid) == -1) if (uid_from_user(val, &uid) == -1)
mtree_err("unknown user `%s'", val); mtree_err("unknown user `%s'", val);
ip->st_uid = uid; ip->st_uid = uid;
}
break; break;
default: default:
mtree_err( mtree_err(