diff options
| author |   Baptiste Daroussin <bapt@FreeBSD.org> | 2015-08-21 09:28:20 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-08-21 09:28:20 +0000 |
| commit | 05dcc5f83aecfd44010756bea5114896033cfb1b (patch) | |
| tree | 893accd2ac63b948fdfb313b1a8059131852d051 | |
| parent | 48159f268a0b0a6f5a378fa469e16c779ec1d49b (diff) | |
| download | pw-darwin-05dcc5f83aecfd44010756bea5114896033cfb1b.tar.gz pw-darwin-05dcc5f83aecfd44010756bea5114896033cfb1b.tar.zst pw-darwin-05dcc5f83aecfd44010756bea5114896033cfb1b.zip | |
Fix /home symlink creation
Add regression test about it
| -rw-r--r-- | pw/pw_user.c | 2 | ||||
| -rwxr-xr-x | pw/tests/pw_useradd.sh | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pw/pw_user.c b/pw/pw_user.c index 35eb1fb..61d468a 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -123,7 +123,7 @@ mkdir_home_parents(int dfd, const char *dir) errx(EX_UNAVAILABLE, "out of memory"); if (mkdirat(dfd, tmp, _DEF_DIRMODE) != -1 || errno == EEXIST) { fchownat(dfd, tmp, 0, 0, 0); - symlinkat(tmp, dfd, dirs + 1); + symlinkat(tmp, dfd, dirs); } free(tmp); } diff --git a/pw/tests/pw_useradd.sh b/pw/tests/pw_useradd.sh index d27df73..10c7816 100755 --- a/pw/tests/pw_useradd.sh +++ b/pw/tests/pw_useradd.sh @@ -246,6 +246,7 @@ user_add_R_body() { atf_check -s exit:0 ${RPW} useradd foo atf_check -s exit:0 ${RPW} useradd bar -m + test -d ${HOME}/home || atf_fail "Home parent directory not created" test -d ${HOME}/home/bar || atf_fail "Directory not created" atf_check -s exit:0 ${RPW} userdel bar test -d ${HOME}/home/bar || atf_fail "Directory removed" @@ -254,6 +255,17 @@ user_add_R_body() { [ ! -d ${HOME}/home/bar ] || atf_fail "Directory not removed" } +atf_test_case user_add_R_symlink +user_add_R_symlink_body() { + populate_root_etc_skel + + mkdir ${HOME}/usr + atf_check -s exit:0 ${RPW} useradd foo -m + test -d ${HOME}/usr/home || atf_fail "Home parent directory not created" + test -h ${HOME}/home || atf_fail "/home directory is not a symlink" + atf_check -s exit:0 -o inline:"usr/home\n" readlink ${HOME}/home +} + atf_test_case user_add_skel user_add_skel_body() { populate_root_etc_skel @@ -348,6 +360,7 @@ atf_init_test_cases() { atf_add_test_case user_add_invalid_group_entry atf_add_test_case user_add_password_from_h atf_add_test_case user_add_R + atf_add_test_case user_add_R_symlink atf_add_test_case user_add_skel atf_add_test_case user_add_uid0 atf_add_test_case user_add_uid_too_large |