Use -1 to indicate an invalid uid/gid, not UID_MAX and GID_MAX.

This is the userland portion.  OK deraadt@ sashan@

5 files changed, 33 insertions, 36 deletions

diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index b29d3b7841d..fd8b3979110 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.698 2019/08/26 18:53:58 tobhe Exp $	*/
+/*	$OpenBSD: parse.y,v 1.699 2019/10/17 21:54:28 millert Exp $	*/
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -2968,7 +2968,7 @@ uid_item	: uid				{
 			$$->tail = $$;
 		}
 		| unaryop uid			{
-			if ($2 == UID_MAX && $1 != PF_OP_EQ && $1 != PF_OP_NE) {
+			if ($2 == -1 && $1 != PF_OP_EQ && $1 != PF_OP_NE) {
 				yyerror("user unknown requires operator = or "
 				    "!=");
 				YYERROR;
@@ -2983,7 +2983,7 @@ uid_item	: uid				{
 			$$->tail = $$;
 		}
 		| uid PORTBINARY uid		{
-			if ($1 == UID_MAX || $3 == UID_MAX) {
+			if ($1 == -1 || $3 == -1) {
 				yyerror("user unknown requires operator = or "
 				    "!=");
 				YYERROR;
@@ -3001,7 +3001,7 @@ uid_item	: uid				{
 
 uid		: STRING			{
 			if (!strcmp($1, "unknown"))
-				$$ = UID_MAX;
+				$$ = -1;
 			else {
 				uid_t uid;
 
@@ -3046,7 +3046,7 @@ gid_item	: gid				{
 			$$->tail = $$;
 		}
 		| unaryop gid			{
-			if ($2 == GID_MAX && $1 != PF_OP_EQ && $1 != PF_OP_NE) {
+			if ($2 == -1 && $1 != PF_OP_EQ && $1 != PF_OP_NE) {
 				yyerror("group unknown requires operator = or "
 				    "!=");
 				YYERROR;
@@ -3061,7 +3061,7 @@ gid_item	: gid				{
 			$$->tail = $$;
 		}
 		| gid PORTBINARY gid		{
-			if ($1 == GID_MAX || $3 == GID_MAX) {
+			if ($1 == -1 || $3 == -1) {
 				yyerror("group unknown requires operator = or "
 				    "!=");
 				YYERROR;
@@ -3079,7 +3079,7 @@ gid_item	: gid				{
 
 gid		: STRING			{
 			if (!strcmp($1, "unknown"))
-				$$ = GID_MAX;
+				$$ = -1;
 			else {
 				gid_t gid;
 
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index c80f66f2587..cef0aa2474f 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_parser.c,v 1.341 2019/06/28 13:32:45 deraadt Exp $ */
+/*	$OpenBSD: pfctl_parser.c,v 1.342 2019/10/17 21:54:28 millert Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -64,7 +64,7 @@
 
 void		 print_op (u_int8_t, const char *, const char *);
 void		 print_port (u_int8_t, u_int16_t, u_int16_t, const char *, int);
-void		 print_ugid (u_int8_t, unsigned, unsigned, const char *, unsigned);
+void		 print_ugid (u_int8_t, id_t, id_t, const char *);
 void		 print_flags (u_int8_t);
 void		 print_fromto(struct pf_rule_addr *, pf_osfp_t,
 		    struct pf_rule_addr *, u_int8_t, u_int8_t, int);
@@ -398,14 +398,14 @@ print_port(u_int8_t op, u_int16_t p1, u_int16_t p2, const char *proto, int opts)
 }
 
 void
-print_ugid(u_int8_t op, unsigned u1, unsigned u2, const char *t, unsigned umax)
+print_ugid(u_int8_t op, id_t i1, id_t i2, const char *t)
 {
 	char	a1[11], a2[11];
 
-	snprintf(a1, sizeof(a1), "%u", u1);
-	snprintf(a2, sizeof(a2), "%u", u2);
+	snprintf(a1, sizeof(a1), "%u", i1);
+	snprintf(a2, sizeof(a2), "%u", i2);
 	printf(" %s", t);
-	if (u1 == umax && (op == PF_OP_EQ || op == PF_OP_NE))
+	if (i1 == -1 && (op == PF_OP_EQ || op == PF_OP_NE))
 		print_op(op, "unknown", a2);
 	else
 		print_op(op, a1, a2);
@@ -837,11 +837,9 @@ print_rule(struct pf_rule *r, const char *anchor_call, int opts)
 		printf(" %sreceived-on %s", r->rcvifnot ? "!" : "",
 		    r->rcv_ifname);
 	if (r->uid.op)
-		print_ugid(r->uid.op, r->uid.uid[0], r->uid.uid[1], "user",
-		    UID_MAX);
+		print_ugid(r->uid.op, r->uid.uid[0], r->uid.uid[1], "user");
 	if (r->gid.op)
-		print_ugid(r->gid.op, r->gid.gid[0], r->gid.gid[1], "group",
-		    GID_MAX);
+		print_ugid(r->gid.op, r->gid.gid[0], r->gid.gid[1], "group");
 	if (r->flags || r->flagset) {
 		printf(" flags ");
 		print_flags(r->flags);
diff --git a/usr.bin/systat/pftop.c b/usr.bin/systat/pftop.c
index f7486fff9ce..8b73f03d76c 100644
--- a/usr.bin/systat/pftop.c
+++ b/usr.bin/systat/pftop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pftop.c,v 1.44 2019/06/28 13:35:04 deraadt Exp $	 */
+/* $OpenBSD: pftop.c,v 1.45 2019/10/17 21:54:29 millert Exp $	 */
 /*
  * Copyright (c) 2001, 2007 Can Erkin Acar
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1260,16 +1260,15 @@ tb_print_fromto(struct pf_rule_addr *src, struct pf_rule_addr *dst,
 }
 
 void
-tb_print_ugid(u_int8_t op, unsigned u1, unsigned u2,
-	      const char *t, unsigned umax)
+tb_print_ugid(u_int8_t op, id_t i1, id_t i2, const char *t)
 {
 	char	a1[11], a2[11];
 
-	snprintf(a1, sizeof(a1), "%u", u1);
-	snprintf(a2, sizeof(a2), "%u", u2);
+	snprintf(a1, sizeof(a1), "%u", i1);
+	snprintf(a2, sizeof(a2), "%u", i2);
 
 	tbprintf("%s ", t);
-	if (u1 == umax && (op == PF_OP_EQ || op == PF_OP_NE))
+	if (i1 == -1 && (op == PF_OP_EQ || op == PF_OP_NE))
 		tb_print_op(op, "unknown", a2);
 	else
 		tb_print_op(op, a1, a2);
@@ -1386,10 +1385,10 @@ print_rule(struct pf_rule *pr)
 
 	if (pr->uid.op)
 		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
-		        "user", UID_MAX);
+		        "user");
 	if (pr->gid.op)
 		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
-		        "group", GID_MAX);
+		        "group");
 
 	if (pr->action == PF_PASS &&
 	    (pr->proto == 0 || pr->proto == IPPROTO_TCP) &&
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 40555109559..14b435944c0 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwd_mkdb.c,v 1.56 2019/06/28 13:32:49 deraadt Exp $	*/
+/*	$OpenBSD: pwd_mkdb.c,v 1.57 2019/10/17 21:54:29 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -210,7 +210,7 @@ main(int argc, char **argv)
 				;
 			memcpy(&olduid, p, sizeof(olduid));
 		} else
-			olduid = UID_MAX;
+			olduid = -1;
 		(dp->close)(dp);
 	}
 
@@ -227,7 +227,7 @@ main(int argc, char **argv)
 	}
 	if (!edp)
 		fatal("%s", buf);
-	if (fchown(edp->fd(edp), (uid_t)-1, shadow) != 0)
+	if (fchown(edp->fd(edp), -1, shadow) != 0)
 		warn("%s: unable to set group to %s", _PATH_SMP_DB,
 		    SHADOW_GROUP);
 	else if (fchmod(edp->fd(edp), PERM_SECURE|S_IRGRP) != 0)
@@ -502,7 +502,7 @@ write_old_entry(FILE *to, const struct passwd *pw)
 	else
 		snprintf(gidstr, sizeof(gidstr), "%u", (u_int)pw->pw_gid);
 
-	if (pw->pw_uid == (uid_t)-1)
+	if (pw->pw_uid == -1)
 		strlcpy(uidstr, "-1", sizeof(uidstr));
 	else
 		snprintf(uidstr, sizeof(uidstr), "%u", (u_int)pw->pw_uid);
@@ -556,7 +556,7 @@ db_store(FILE *fp, FILE *oldfp, DB *edp, DB *dp, struct passwd *pw,
 				continue;
 			found = 1;
 			/* If the uid changed, remove the old record by uid. */
-			if (olduid != UID_MAX && olduid != pw->pw_uid) {
+			if (olduid != -1 && olduid != pw->pw_uid) {
 				tbuf[0] = _PW_KEYBYUID;
 				memcpy(tbuf + 1, &olduid, sizeof(olduid));
 				key.size = sizeof(olduid) + 1;
@@ -632,7 +632,7 @@ db_store(FILE *fp, FILE *oldfp, DB *edp, DB *dp, struct passwd *pw,
 	}
 	if (firsttime) {
 		firsttime = 0;
-		if (username && !found && olduid != UID_MAX)
+		if (username && !found && olduid != -1)
 			fatalx("can't find user in master.passwd");
 	}
 }
diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c
index 03de2b5e0bb..0986df6ba35 100644
--- a/usr.sbin/user/user.c
+++ b/usr.sbin/user/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.127 2019/07/03 03:24:03 deraadt Exp $ */
+/* $OpenBSD: user.c,v 1.128 2019/10/17 21:54:29 millert Exp $ */
 /* $NetBSD: user.c,v 1.69 2003/04/14 17:40:07 agc Exp $ */
 
 /*
@@ -1051,7 +1051,7 @@ adduser(char *login_name, user_t *up)
 	}
 	/* if no uid was specified, get next one in [low_uid..high_uid] range */
 	sync_uid_gid = (strcmp(up->u_primgrp, "=uid") == 0);
-	if (up->u_uid == UID_MAX) {
+	if (up->u_uid == -1) {
 		int got_id = 0;
 
 		/*
@@ -1787,7 +1787,7 @@ useradd(int argc, char **argv)
 
 	memset(&u, 0, sizeof(u));
 	read_defaults(&u);
-	u.u_uid = UID_MAX;
+	u.u_uid = -1;
 	defaultfield = bigD = 0;
 	while ((c = getopt(argc, argv, "DG:L:b:c:d:e:f:g:k:mop:r:s:u:v")) != -1) {
 		switch(c) {
@@ -2113,7 +2113,7 @@ groupadd(int argc, char **argv)
 	int	c;
 	const char *errstr;
 
-	gid = GID_MAX;
+	gid = -1;
 	dupgid = 0;
 	while ((c = getopt(argc, argv, "g:ov")) != -1) {
 		switch(c) {
@@ -2210,7 +2210,7 @@ groupmod(int argc, char **argv)
 	int		cc;
 	int		c;
 
-	gid = GID_MAX;
+	gid = -1;
 	dupgid = 0;
 	newname = NULL;
 	while ((c = getopt(argc, argv, "g:n:ov")) != -1) {