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

Fix wrong message when using pw -V with a non existent directory

Browse Source 
Add a regression test about it

PR:		194971
Submitted by:	Freddy DISSAUX <bugzilla@dsx.bsdsx.fr>
This commit is contained in:
Baptiste Daroussin 2014-11-12 22:27:53 +00:00
parent bf39c5e8d5
commit 90edef4fe0
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/pw/pw.c
View File

@ -98,6 +98,7 @@ main(int argc, char *argv[])
int which = -1; int which = -1;
char *config = NULL; char *config = NULL;
struct userconf *cnf; struct userconf *cnf;
struct stat st;
static const char *opts[W_NUM][M_NUM] = static const char *opts[W_NUM][M_NUM] =
{ {
@ -143,6 +144,13 @@ main(int argc, char *argv[])
if (argv[1][1] == 'V') { if (argv[1][1] == 'V') {
optarg = &argv[1][2]; optarg = &argv[1][2];
if (*optarg == '\0') { if (*optarg == '\0') {
if (stat(argv[2], &st) != 0)
errx(EX_OSFILE, \
"no such directory `%s'",
argv[2]);
if (!S_ISDIR(st.st_mode))
errx(EX_OSFILE, "`%s' not a "
"directory", argv[2]);
optarg = argv[2]; optarg = argv[2];
++argv; ++argv;
--argc; --argc;

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

@ -5,7 +5,7 @@ TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.sbin/useradd
TESTSDIR= ${TESTSBASE}/usr.sbin/pw TESTSDIR= ${TESTSBASE}/usr.sbin/pw
ATF_TESTS_SH= pw_delete pw_modify ATF_TESTS_SH= pw_delete pw_modify pw_etcdir
TEST_METADATA.pw_delete+= required_user="root" TEST_METADATA.pw_delete+= required_user="root"
TEST_METADATA.pw_modify+= required_user="root" TEST_METADATA.pw_modify+= required_user="root"

18
usr.sbin/pw/tests/pw_etcdir.sh Executable file
View File

@ -0,0 +1,18 @@
# $FreeBSD$
# When provide -V dir, dir must exists
atf_test_case etcdir_must_exists
etcdir_must_exists_head() {
atf_set "descr" "When provide -V dir, dir must exists"
}
etcdir_must_exists_body() {
local fakedir="/this_directory_does_not_exists"
atf_check -e inline:"pw: no such directory \`$fakedir'\n" \
-s exit:72 -x pw -V ${fakedir} usershow root
}
atf_init_test_cases() {
atf_add_test_case etcdir_must_exists
}