[Midnightbsd-cvs] src [10616] trunk/lib/libugidfw/ugidfw.c: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 9 11:29:25 EDT 2018
Revision: 10616
http://svnweb.midnightbsd.org/src/?rev=10616
Author: laffer1
Date: 2018-06-09 11:29:25 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/lib/libugidfw/ugidfw.c
Modified: trunk/lib/libugidfw/ugidfw.c
===================================================================
--- trunk/lib/libugidfw/ugidfw.c 2018-06-09 15:28:22 UTC (rev 10615)
+++ trunk/lib/libugidfw/ugidfw.c 2018-06-09 15:29:25 UTC (rev 10616)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002-2005 Networks Associates Technology, Inc.
* All rights reserved.
@@ -28,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/lib/libugidfw/ugidfw.c 325462 2017-11-05 22:36:32Z ngie $
*/
#include <sys/param.h>
#include <sys/errno.h>
@@ -513,7 +514,6 @@
uid_t uid1, uid2;
char *spec1, *spec2, *endp;
unsigned long value;
- size_t len;
spec2 = spec;
spec1 = strsep(&spec2, ":");
@@ -524,8 +524,7 @@
else {
value = strtoul(spec1, &endp, 10);
if (*endp != '\0') {
- len = snprintf(errstr, buflen,
- "invalid uid: '%s'", spec1);
+ snprintf(errstr, buflen, "invalid uid: '%s'", spec1);
return (-1);
}
uid1 = value;
@@ -542,8 +541,7 @@
else {
value = strtoul(spec2, &endp, 10);
if (*endp != '\0') {
- len = snprintf(errstr, buflen,
- "invalid uid: '%s'", spec2);
+ snprintf(errstr, buflen, "invalid uid: '%s'", spec2);
return (-1);
}
uid2 = value;
@@ -562,7 +560,6 @@
gid_t gid1, gid2;
char *spec1, *spec2, *endp;
unsigned long value;
- size_t len;
spec2 = spec;
spec1 = strsep(&spec2, ":");
@@ -573,8 +570,7 @@
else {
value = strtoul(spec1, &endp, 10);
if (*endp != '\0') {
- len = snprintf(errstr, buflen,
- "invalid gid: '%s'", spec1);
+ snprintf(errstr, buflen, "invalid gid: '%s'", spec1);
return (-1);
}
gid1 = value;
@@ -591,8 +587,7 @@
else {
value = strtoul(spec2, &endp, 10);
if (*endp != '\0') {
- len = snprintf(errstr, buflen,
- "invalid gid: '%s'", spec2);
+ snprintf(errstr, buflen, "invalid gid: '%s'", spec2);
return (-1);
}
gid2 = value;
@@ -614,7 +609,6 @@
uid_t uid_min, uid_max;
gid_t gid_min, gid_max;
int jid;
- size_t len;
long value;
current = 0;
@@ -631,11 +625,11 @@
while (current < argc) {
if (strcmp(argv[current], "uid") == 0) {
if (current + 2 > argc) {
- len = snprintf(errstr, buflen, "uid short");
+ snprintf(errstr, buflen, "uid short");
return (-1);
}
if (flags & MBS_UID_DEFINED) {
- len = snprintf(errstr, buflen, "one uid only");
+ snprintf(errstr, buflen, "one uid only");
return (-1);
}
if (bsde_parse_uidrange(argv[current+1],
@@ -649,11 +643,11 @@
current += 2;
} else if (strcmp(argv[current], "gid") == 0) {
if (current + 2 > argc) {
- len = snprintf(errstr, buflen, "gid short");
+ snprintf(errstr, buflen, "gid short");
return (-1);
}
if (flags & MBS_GID_DEFINED) {
- len = snprintf(errstr, buflen, "one gid only");
+ snprintf(errstr, buflen, "one gid only");
return (-1);
}
if (bsde_parse_gidrange(argv[current+1],
@@ -667,17 +661,17 @@
current += 2;
} else if (strcmp(argv[current], "jailid") == 0) {
if (current + 2 > argc) {
- len = snprintf(errstr, buflen, "prison short");
+ snprintf(errstr, buflen, "prison short");
return (-1);
}
if (flags & MBS_PRISON_DEFINED) {
- len = snprintf(errstr, buflen, "one jail only");
+ snprintf(errstr, buflen, "one jail only");
return (-1);
}
value = strtol(argv[current+1], &endp, 10);
if (*endp != '\0') {
- len = snprintf(errstr, buflen,
- "invalid jid: '%s'", argv[current+1]);
+ snprintf(errstr, buflen, "invalid jid: '%s'",
+ argv[current+1]);
return (-1);
}
jid = value;
@@ -689,14 +683,13 @@
current += 2;
} else if (strcmp(argv[current], "!") == 0) {
if (nextnot) {
- len = snprintf(errstr, buflen,
- "double negative");
+ snprintf(errstr, buflen, "double negative");
return (-1);
}
nextnot = 1;
current += 1;
} else {
- len = snprintf(errstr, buflen, "'%s' not expected",
+ snprintf(errstr, buflen, "'%s' not expected",
argv[current]);
return (-1);
}
@@ -724,7 +717,6 @@
int
bsde_parse_type(char *spec, int *type, size_t buflen, char *errstr)
{
- size_t len;
int i;
*type = 0;
@@ -756,10 +748,10 @@
*type |= MBO_ALL_TYPE;
break;
default:
- len = snprintf(errstr, buflen, "Unknown type code: %c",
+ snprintf(errstr, buflen, "Unknown type code: %c",
spec[i]);
return (-1);
- }
+ }
}
return (0);
@@ -768,11 +760,10 @@
int
bsde_parse_fsid(char *spec, struct fsid *fsid, size_t buflen, char *errstr)
{
- size_t len;
struct statfs buf;
if (statfs(spec, &buf) < 0) {
- len = snprintf(errstr, buflen, "Unable to get id for %s: %s",
+ snprintf(errstr, buflen, "Unable to get id for %s: %s",
spec, strerror(errno));
return (-1);
}
@@ -792,7 +783,6 @@
gid_t gid_min, gid_max;
int type;
struct fsid fsid;
- size_t len;
current = 0;
flags = 0;
@@ -808,11 +798,11 @@
while (current < argc) {
if (strcmp(argv[current], "uid") == 0) {
if (current + 2 > argc) {
- len = snprintf(errstr, buflen, "uid short");
+ snprintf(errstr, buflen, "uid short");
return (-1);
}
if (flags & MBO_UID_DEFINED) {
- len = snprintf(errstr, buflen, "one uid only");
+ snprintf(errstr, buflen, "one uid only");
return (-1);
}
if (bsde_parse_uidrange(argv[current+1],
@@ -826,11 +816,11 @@
current += 2;
} else if (strcmp(argv[current], "gid") == 0) {
if (current + 2 > argc) {
- len = snprintf(errstr, buflen, "gid short");
+ snprintf(errstr, buflen, "gid short");
return (-1);
}
if (flags & MBO_GID_DEFINED) {
- len = snprintf(errstr, buflen, "one gid only");
+ snprintf(errstr, buflen, "one gid only");
return (-1);
}
if (bsde_parse_gidrange(argv[current+1],
@@ -844,11 +834,11 @@
current += 2;
} else if (strcmp(argv[current], "filesys") == 0) {
if (current + 2 > argc) {
- len = snprintf(errstr, buflen, "filesys short");
+ snprintf(errstr, buflen, "filesys short");
return (-1);
}
if (flags & MBO_FSID_DEFINED) {
- len = snprintf(errstr, buflen, "one fsid only");
+ snprintf(errstr, buflen, "one fsid only");
return (-1);
}
if (bsde_parse_fsid(argv[current+1], &fsid,
@@ -890,11 +880,11 @@
current += 1;
} else if (strcmp(argv[current], "type") == 0) {
if (current + 2 > argc) {
- len = snprintf(errstr, buflen, "type short");
+ snprintf(errstr, buflen, "type short");
return (-1);
}
if (flags & MBO_TYPE_DEFINED) {
- len = snprintf(errstr, buflen, "one type only");
+ snprintf(errstr, buflen, "one type only");
return (-1);
}
if (bsde_parse_type(argv[current+1], &type,
@@ -908,7 +898,7 @@
current += 2;
} else if (strcmp(argv[current], "!") == 0) {
if (nextnot) {
- len = snprintf(errstr, buflen,
+ snprintf(errstr, buflen,
"double negative'");
return (-1);
}
@@ -915,7 +905,7 @@
nextnot = 1;
current += 1;
} else {
- len = snprintf(errstr, buflen, "'%s' not expected",
+ snprintf(errstr, buflen, "'%s' not expected",
argv[current]);
return (-1);
}
@@ -946,16 +936,15 @@
bsde_parse_mode(int argc, char *argv[], mode_t *mode, size_t buflen,
char *errstr)
{
- size_t len;
int i;
if (argc == 0) {
- len = snprintf(errstr, buflen, "mode expects mode value");
+ snprintf(errstr, buflen, "mode expects mode value");
return (-1);
}
if (argc != 1) {
- len = snprintf(errstr, buflen, "'%s' unexpected", argv[1]);
+ snprintf(errstr, buflen, "'%s' unexpected", argv[1]);
return (-1);
}
@@ -981,7 +970,7 @@
/* ignore */
break;
default:
- len = snprintf(errstr, buflen, "Unknown mode letter: %c",
+ snprintf(errstr, buflen, "Unknown mode letter: %c",
argv[0][i]);
return (-1);
}
@@ -998,17 +987,16 @@
int object, object_elements, object_elements_length;
int mode, mode_elements, mode_elements_length;
int error, i;
- size_t len;
bzero(rule, sizeof(*rule));
if (argc < 1) {
- len = snprintf(errstr, buflen, "Rule must begin with subject");
+ snprintf(errstr, buflen, "Rule must begin with subject");
return (-1);
}
if (strcmp(argv[0], "subject") != 0) {
- len = snprintf(errstr, buflen, "Rule must begin with subject");
+ snprintf(errstr, buflen, "Rule must begin with subject");
return (-1);
}
subject = 0;
@@ -1022,7 +1010,7 @@
object = i;
if (object == -1) {
- len = snprintf(errstr, buflen, "Rule must contain an object");
+ snprintf(errstr, buflen, "Rule must contain an object");
return (-1);
}
@@ -1033,7 +1021,7 @@
mode = i;
if (mode == -1) {
- len = snprintf(errstr, buflen, "Rule must contain mode");
+ snprintf(errstr, buflen, "Rule must contain mode");
return (-1);
}
@@ -1112,12 +1100,12 @@
len = sizeof(version);
error = sysctlbyname(MIB ".rule_version", &version, &len, NULL, 0);
if (error) {
- len = snprintf(errstr, buflen, "version check failed: %s",
+ snprintf(errstr, buflen, "version check failed: %s",
strerror(errno));
return (-1);
}
if (version != MB_VERSION) {
- len = snprintf(errstr, buflen, "module v%d != library v%d",
+ snprintf(errstr, buflen, "module v%d != library v%d",
version, MB_VERSION);
return (-1);
}
@@ -1134,11 +1122,11 @@
len = sizeof(rule_count);
error = sysctlbyname(MIB ".rule_count", &rule_count, &len, NULL, 0);
if (error) {
- len = snprintf(errstr, buflen, "%s", strerror(errno));
+ snprintf(errstr, buflen, "%s", strerror(errno));
return (-1);
}
if (len != sizeof(rule_count)) {
- len = snprintf(errstr, buflen, "Data error in %s.rule_count",
+ snprintf(errstr, buflen, "Data error in %s.rule_count",
MIB);
return (-1);
}
@@ -1156,12 +1144,11 @@
len = sizeof(rule_slots);
error = sysctlbyname(MIB ".rule_slots", &rule_slots, &len, NULL, 0);
if (error) {
- len = snprintf(errstr, buflen, "%s", strerror(errno));
+ snprintf(errstr, buflen, "%s", strerror(errno));
return (-1);
}
if (len != sizeof(rule_slots)) {
- len = snprintf(errstr, buflen, "Data error in %s.rule_slots",
- MIB);
+ snprintf(errstr, buflen, "Data error in %s.rule_slots", MIB);
return (-1);
}
@@ -1187,7 +1174,7 @@
len = 10;
error = bsde_get_mib(MIB ".rules", name, &len);
if (error) {
- len = snprintf(errstr, errlen, "%s: %s", MIB ".rules",
+ snprintf(errstr, errlen, "%s: %s", MIB ".rules",
strerror(errno));
return (-1);
}
@@ -1199,11 +1186,11 @@
if (error == -1 && errno == ENOENT)
return (-2);
if (error) {
- len = snprintf(errstr, errlen, "%s.%d: %s", MIB ".rules",
+ snprintf(errstr, errlen, "%s.%d: %s", MIB ".rules",
rulenum, strerror(errno));
return (-1);
} else if (size != sizeof(*rule)) {
- len = snprintf(errstr, errlen, "Data error in %s.%d: %s",
+ snprintf(errstr, errlen, "Data error in %s.%d: %s",
MIB ".rules", rulenum, strerror(errno));
return (-1);
}
@@ -1225,7 +1212,7 @@
len = 10;
error = bsde_get_mib(MIB ".rules", name, &len);
if (error) {
- len = snprintf(errstr, buflen, "%s: %s", MIB ".rules",
+ snprintf(errstr, buflen, "%s: %s", MIB ".rules",
strerror(errno));
return (-1);
}
@@ -1236,7 +1223,7 @@
size = sizeof(rule);
error = sysctl(name, len, NULL, NULL, &rule, 0);
if (error) {
- len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules",
+ snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules",
rulenum, strerror(errno));
return (-1);
}
@@ -1258,7 +1245,7 @@
len = 10;
error = bsde_get_mib(MIB ".rules", name, &len);
if (error) {
- len = snprintf(errstr, buflen, "%s: %s", MIB ".rules",
+ snprintf(errstr, buflen, "%s: %s", MIB ".rules",
strerror(errno));
return (-1);
}
@@ -1269,7 +1256,7 @@
size = sizeof(*rule);
error = sysctl(name, len, NULL, NULL, rule, size);
if (error) {
- len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules",
+ snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules",
rulenum, strerror(errno));
return (-1);
}
@@ -1292,7 +1279,7 @@
len = 10;
error = bsde_get_mib(MIB ".rules", name, &len);
if (error) {
- len = snprintf(errstr, buflen, "%s: %s", MIB ".rules",
+ snprintf(errstr, buflen, "%s: %s", MIB ".rules",
strerror(errno));
return (-1);
}
@@ -1299,7 +1286,7 @@
rule_slots = bsde_get_rule_slots(BUFSIZ, charstr);
if (rule_slots == -1) {
- len = snprintf(errstr, buflen, "unable to get rule slots: %s",
+ snprintf(errstr, buflen, "unable to get rule slots: %s",
strerror(errno));
return (-1);
}
@@ -1310,7 +1297,7 @@
size = sizeof(*rule);
error = sysctl(name, len, NULL, NULL, rule, size);
if (error) {
- len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules",
+ snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules",
rule_slots, strerror(errno));
return (-1);
}
More information about the Midnightbsd-cvs
mailing list