diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2023-02-03 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2023-02-03 08:00:00 +0000 |
| commit | 6e6c068355c0a7937219570a9034445728d421bb (patch) | |
| tree | 8a2743c90fee164fcc2b9e2c01b0a87bd89e12da | |
| parent | 6a9cec2af8d570cf9d457e1bad271418fb424842 (diff) | |
| download | linux-pam-git-6e6c068355c0a7937219570a9034445728d421bb.tar.gz | |
pam_env: do not hardcode /usr/etc into tests
* modules/pam_env/tst-pam_env-retval.c: Replace /usr/etc/security with
VENDOR_SCONFIGDIR, /usr/etc with VENDORDIR. Do not define and use
VENDORDIR based variables unless VENDORDIR is defined.
Fixes: 6135c45347b6 ("pam_env: Use vendor specific pam_env.conf and environment as fallback")
| -rw-r--r-- | modules/pam_env/tst-pam_env-retval.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/modules/pam_env/tst-pam_env-retval.c b/modules/pam_env/tst-pam_env-retval.c index 99e2e2a5..af0d0d9b 100644 --- a/modules/pam_env/tst-pam_env-retval.c +++ b/modules/pam_env/tst-pam_env-retval.c @@ -21,14 +21,16 @@ static const char service_file[] = TEST_NAME ".service"; static const char missing_file[] = TEST_NAME ".missing"; -static const char dir[] = TEST_NAME_DIR; -static const char dir_usr[] = TEST_NAME_DIR "/usr"; -static const char dir_usr_etc[] = TEST_NAME_DIR "/usr/etc"; -static const char dir_usr_etc_security[] = TEST_NAME_DIR "/usr/etc/security"; static const char my_conf[] = TEST_NAME ".conf"; static const char my_env[] = TEST_NAME ".env"; -static const char usr_env[] = TEST_NAME_DIR "/usr/etc/environment"; -static const char usr_conf[] = TEST_NAME_DIR "/usr/etc/security/pam_env.conf"; +#ifdef VENDORDIR +static const char dir[] = TEST_NAME_DIR; +static const char dir_usr[] = TEST_NAME_DIR "/usr"; +static const char dir_usr_etc[] = TEST_NAME_DIR VENDORDIR; +static const char dir_usr_etc_security[] = TEST_NAME_DIR VENDOR_SCONFIGDIR; +static const char usr_env[] = TEST_NAME_DIR VENDORDIR "/environment"; +static const char usr_conf[] = TEST_NAME_DIR VENDOR_SCONFIGDIR "/pam_env.conf"; +#endif static struct pam_conv conv; @@ -37,11 +39,6 @@ setup(void) { FILE *fp; - ASSERT_EQ(0, mkdir(dir, 0755)); - ASSERT_EQ(0, mkdir(dir_usr, 0755)); - ASSERT_EQ(0, mkdir(dir_usr_etc, 0755)); - ASSERT_EQ(0, mkdir(dir_usr_etc_security, 0755)); - ASSERT_NE(NULL, fp = fopen(my_conf, "w")); ASSERT_LT(0, fprintf(fp, "EDITOR\tDEFAULT=vim\n" @@ -54,6 +51,12 @@ setup(void) "test2_value=bar\n")); ASSERT_EQ(0, fclose(fp)); +#ifdef VENDORDIR + ASSERT_EQ(0, mkdir(dir, 0755)); + ASSERT_EQ(0, mkdir(dir_usr, 0755)); + ASSERT_EQ(0, mkdir(dir_usr_etc, 0755)); + ASSERT_EQ(0, mkdir(dir_usr_etc_security, 0755)); + ASSERT_NE(NULL, fp = fopen(usr_env, "w")); ASSERT_LT(0, fprintf(fp, "usr_etc_test=foo\n" @@ -65,6 +68,7 @@ setup(void) "PAGER DEFAULT=emacs\n" "MANPAGER DEFAULT=less\n")); ASSERT_EQ(0, fclose(fp)); +#endif } static void @@ -72,12 +76,14 @@ cleanup(void) { ASSERT_EQ(0, unlink(my_conf)); ASSERT_EQ(0, unlink(my_env)); +#ifdef VENDORDIR ASSERT_EQ(0, unlink(usr_env)); ASSERT_EQ(0, unlink(usr_conf)); ASSERT_EQ(0, rmdir(dir_usr_etc_security)); ASSERT_EQ(0, rmdir(dir_usr_etc)); ASSERT_EQ(0, rmdir(dir_usr)); ASSERT_EQ(0, rmdir(dir)); +#endif } static void @@ -221,7 +227,7 @@ main(void) const char *env2[] = { "test_value=foo", "test2_value=bar", NULL }; check_env(env2); -#if defined (USE_ECONF) && defined (VENDORDIR) +#if defined (USE_ECONF) && defined (VENDORDIR) /* envfile is a directory. So values will be read from {TEST_NAME_DIR}/usr/etc and {TEST_NAME_DIR}/etc */ ASSERT_NE(NULL, fp = fopen(service_file, "w")); |