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

Revert r277652

Browse Source 
uid and gid are never and should never be negative. The pw(8) manpage clearly
states the -u and -g arguments are for uids/gids, hence using negative values is
abusing a bug in former versions of pw(8)
This commit is contained in:
Baptiste Daroussin 2015-01-26 16:50:42 +00:00
parent 86f05ea6cf
commit 4b2b10bd25
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=277764
5 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/pw/pw_group.c
View File

@ -68,11 +68,7 @@ pw_group(struct userconf * cnf, int mode, struct cargs * args)
};
if (a_gid != NULL) {
const char *teststr;
teststr = a_gid->val;
if (*teststr == '-')
teststr++;
if (strspn(teststr, "0123456789") != strlen(teststr))
if (strspn(a_gid->val, "0123456789") != strlen(a_gid->val))
errx(EX_USAGE, "-g expects a number");
}

5
usr.sbin/pw/pw_user.c
View File

@ -322,10 +322,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
a_name = NULL;
}
} else {
const char *teststr = a_uid->val;
if (*teststr == '-')
teststr++;
if (strspn(teststr, "0123456789") != strlen(teststr))
if (strspn(a_uid->val, "0123456789") != strlen(a_uid->val))
errx(EX_USAGE, "-u expects a number");
}

4
usr.sbin/pw/tests/Makefile
View File

@ -9,11 +9,9 @@ ATF_TESTS_SH= pw_etcdir \
pw_lock \
pw_groupdel \
pw_groupmod \
pw_groupshow \
pw_useradd \
pw_userdel \
pw_usermod \
pw_usershow
pw_usermod
.for tp in ${ATF_TESTS_SH}
TEST_METADATA.${tp}+= required_user="root"

19
usr.sbin/pw/tests/pw_groupshow.sh
View File

@ -1,19 +0,0 @@
# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
# Test negative uid are still valid
# PR: 196514
atf_test_case show_group_with_negative_number
show_group_with_negative_number_body() {
populate_etc_skel
atf_check -s exit:0 \
-o inline:"wheel:*:0:root\n" \
${PW} groupshow -n wheel -g -1
}
atf_init_test_cases() {
atf_add_test_case show_group_with_negative_number
}

19
usr.sbin/pw/tests/pw_usershow.sh
View File

@ -1,19 +0,0 @@
# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
# Test negative uid are still valid
# PR: 196514
atf_test_case show_user_with_negative_number
show_user_with_negative_number_body() {
populate_etc_skel
atf_check -s exit:0 \
-o inline:"root:*:0:0::0:0:Charlie &:/root:/bin/csh\n" \
${PW} usershow -n root -u -1
}
atf_init_test_cases() {
atf_add_test_case show_user_with_negative_number
}