commit - 80423302e7fa11406eae40d95698684cb77132ed93b4510e0a1a9db3f68a112c
commit + efdf8bc63f43a23d5fa80ba23dab206cfb41ec2b00e87d7b3ea147d78471311f
blob - 7c6b1d630e07d97c4249e75224d32c15070407094659e6455ec6346ac87c023c
blob + d2bdceec2a2c930877fe3f9fdca0bcd5cb0d8397ef13243fc39eb6ecf2df9d06
--- gotd/auth.c
+++ gotd/auth.c
if ((gr = getgrnam(s)) != NULL) {
*gid = gr->gr_gid;
- if (*gid == GID_MAX)
+ if (*gid == -1)
return -1;
return 0;
}
- *gid = strtonum(s, 0, GID_MAX - 1, &errstr);
+ *gid = strtonum(s, 0, UINT_MAX - 1, &errstr);
if (errstr)
return -1;
return 0;
blob - cad4bc20424dd758b54744eace53e36a9b1d6c02aa009f3c58c880a2dddeb10f
blob + d4548a9acd18cc30e1a75efd7cbc939978ac45e06266c9044ca7453fa34db147
--- gotd/gotd.c
+++ gotd/gotd.c
pw = getpwnam(gotd.user_name);
if (pw == NULL) {
- uid = strtonum(gotd.user_name, 0, UID_MAX - 1, &errstr);
+ uid = strtonum(gotd.user_name, 0, UINT_MAX - 1, &errstr);
if (errstr == NULL)
pw = getpwuid(uid);
}
pw = getpwnam(gotd.user_name);
if (pw == NULL) {
- uid = strtonum(gotd.user_name, 0, UID_MAX - 1, &errstr);
+ uid = strtonum(gotd.user_name, 0, UINT_MAX - 1, &errstr);
if (errstr == NULL)
pw = getpwuid(uid);
}
blob - 47c98dd7533f15157c3bc9aac372074ab5f5eedaafe54887ffb6a7a623fb5a6f
blob + 79a17abde6b9199445d4e4b75920548b1e607cfba97db663e79ab52a5741cd7d
--- gotd/parse.y
+++ gotd/parse.y
if ((pw = getpwnam(s)) != NULL) {
*uid = pw->pw_uid;
- if (*uid == UID_MAX)
+ if (*uid == -1)
return -1;
return 0;
}
- *uid = strtonum(s, 0, UID_MAX - 1, &errstr);
+ *uid = strtonum(s, 0, UINT_MAX - 1, &errstr);
if (errstr)
return -1;
return 0;
blob - eaa1f8458f9ea7c302a662a4ea16ba30707d6c715eab72a118b021b3adc0e0d5
blob + f30936430dd058148d2ffccc850bc4d9e8f69ef314375dab55ca85928f45e075
--- gotsysd/auth.c
+++ gotsysd/auth.c
if ((gr = getgrnam(s)) != NULL) {
*gid = gr->gr_gid;
- if (*gid == GID_MAX)
+ if (*gid == -1)
return -1;
return 0;
}
- *gid = strtonum(s, 0, GID_MAX - 1, &errstr);
+ *gid = strtonum(s, 0, UINT_MAX - 1, &errstr);
if (errstr)
return -1;
return 0;
blob - fa1d68e7785b770d87e7c8e8ddfa6e3bd1276bb264b8ebac6faea3cfb46e2d28
blob + ddca0b4c0099653633d4b29c94a1e52d27cb5d3e0f62f3abb64a4de8c60ee294
--- gotsysd/gotsysd.c
+++ gotsysd/gotsysd.c
pw = getpwnam(gotsysd.gotd_username);
if (pw == NULL) {
- uid = strtonum(gotsysd.gotd_username, 0, UID_MAX - 1, &errstr);
+ uid = strtonum(gotsysd.gotd_username, 0, UINT_MAX - 1, &errstr);
if (errstr == NULL) {
pw = getpwuid(uid);
if (pw && strlcpy(gotsysd.gotd_username, pw->pw_name,
pw = getpwnam(gotsysd.user_name);
if (pw == NULL) {
- uid = strtonum(gotsysd.user_name, 0, UID_MAX - 1, &errstr);
+ uid = strtonum(gotsysd.user_name, 0, UINT_MAX - 1, &errstr);
if (errstr == NULL) {
pw = getpwuid(uid);
if (pw && strlcpy(gotsysd.user_name, pw->pw_name,
blob - d25febab28f777451d948273d1e4c9d012cb23185b749fe65c612f34fdfe1d4b
blob + e965f7907331305cde54979a30328dc519d1b9edc6fce03e174fb448fc3db153
--- gotsysd/libexec/gotsys-groupadd/gotsys-groupadd.c
+++ gotsysd/libexec/gotsys-groupadd/gotsys-groupadd.c
/* sanity checks -- should not happen */
if (groupadd_gid_start == 0 || groupadd_gid_start >= groupadd_gid_end ||
- g < GOTSYSD_UID_MIN || g < groupadd_gid_start || g == GID_MAX)
+ g < GOTSYSD_UID_MIN || g < groupadd_gid_start || g == -1)
abort();
if (g > groupadd_gid_end) {
blob - 1d4901fd286f8057718f97ea93a01fa8f79a234d039647b2a869843bbb663c2b
blob + 4b523aee088fd881ce4222667a716ff279d5e7a2e0f582692076ce692eb41f48
--- gotsysd/libexec/gotsys-useradd/gotsys-useradd.c
+++ gotsysd/libexec/gotsys-useradd/gotsys-useradd.c
/* sanity checks -- should not happen */
if (useradd_uid_start == 0 || useradd_uid_start >= useradd_uid_end ||
- u < GOTSYSD_UID_MIN || u < useradd_uid_start || u == UID_MAX) {
+ u < GOTSYSD_UID_MIN || u < useradd_uid_start || u == -1) {
pw_abort();
abort();
}
ssize_t w;
/* sanity */
- if (uid == 0 || uid == UID_MAX) {
+ if (uid == 0 || uid == -1) {
pw_abort();
abort();
}
blob - fd595a0105dd8058fa7f56542a1ff53d0900b93122ffe04d9f5ba47782439ed9
blob + 08b340d763b1a630ff1e8dc868714d99caf3e7dccfffc3933ae3c7d36d37b2d9
--- gotsysd/libexec/gotsys-userhome/gotsys-userhome.c
+++ gotsysd/libexec/gotsys-userhome/gotsys-userhome.c
#if GOTSYSD_UID_MIN == 0
#error "UID 0 must not be used as GOTSYSD_UID_MIN"
#endif
-#if GOTSYSD_UID_MIN == UID_MAX
-#error "UID UID_MAX must not be used as GOTSYSD_UID_MIN"
+#if GOTSYSD_UID_MIN == UINT_MAX
+#error "UID UINT_MAX must not be used as GOTSYSD_UID_MIN"
#endif
if (userhome_uid_start == 0 || userhome_uid_start >= userhome_uid_end)
abort();
blob - 2602f09c74aec036807a1f1d9d9032c66d9fa100aeef421a8ea58ee5ed5c1f34
blob + 453889c58d0fd6e1bb5f5a1cf57a9ba88e969570a7350ca6a19da1322e0a0b44
--- gotsysd/parse.y
+++ gotsysd/parse.y
#if GOTSYSD_UID_MIN == 0
#error "UID 0 must not be used as GOTSYSD_UID_MIN"
#endif
-#if GOTSYSD_UID_MIN == UID_MAX
-#error "UID UID_MAX must not be used as GOTSYSD_UID_MIN"
+#if GOTSYSD_UID_MIN == UINT_MAX
+#error "UID UINT_MAX must not be used as GOTSYSD_UID_MIN"
#endif
if (gotsysd->uid_start < GOTSYSD_UID_MIN ||
gotsysd->uid_end < GOTSYSD_UID_MIN) {
YYERROR;
}
- if (gotsysd->uid_start == UID_MAX ||
- gotsysd->uid_end == UID_MAX) {
+ if (gotsysd->uid_start == UINT_MAX ||
+ gotsysd->uid_end == UINT_MAX) {
yyerror("%s: UID %u is not allowed in "
- "uid range", __func__, UID_MAX);
+ "uid range", __func__, UINT_MAX);
YYERROR;
}
if ((pw = getpwnam(s)) != NULL) {
*uid = pw->pw_uid;
- if (*uid == UID_MAX)
+ if (*uid == -1)
return -1;
return 0;
}
- *uid = strtonum(s, 0, UID_MAX - 1, &errstr);
+ *uid = strtonum(s, 0, UINT_MAX - 1, &errstr);
if (errstr)
return -1;
return 0;
blob - 0af20dc9df4f520bbbc9afddaa9f3c5364ec7038cb6e1cb4588f473274285df0
blob + 186b32ac5704d52bac5654258ebace7588d1919111a423580b6ec14e0d187852
--- gotwebd/auth.c
+++ gotwebd/auth.c
if ((pw = getpwnam(s)) != NULL) {
*uid = pw->pw_uid;
- if (*uid == UID_MAX)
+ if (*uid == -1)
return -1;
return 0;
}
- *uid = strtonum(s, 0, UID_MAX - 1, &errstr);
+ *uid = strtonum(s, 0, UINT_MAX - 1, &errstr);
if (errstr)
return -1;
return 0;
if ((gr = getgrnam(s)) != NULL) {
*gid = gr->gr_gid;
- if (*gid == GID_MAX)
+ if (*gid == -1)
return -1;
return 0;
}
- *gid = strtonum(s, 0, GID_MAX - 1, &errstr);
+ *gid = strtonum(s, 0, UINT_MAX - 1, &errstr);
if (errstr)
return -1;
return 0;