diff options
Diffstat (limited to 'modules/pam_canonicalize_user')
| -rw-r--r-- | modules/pam_canonicalize_user/Makefile.am | 11 | ||||
| -rw-r--r-- | modules/pam_canonicalize_user/tst-pam_canonicalize_user-retval.c | 22 |
2 files changed, 17 insertions, 16 deletions
diff --git a/modules/pam_canonicalize_user/Makefile.am b/modules/pam_canonicalize_user/Makefile.am index 0fd16521..ce335c12 100644 --- a/modules/pam_canonicalize_user/Makefile.am +++ b/modules/pam_canonicalize_user/Makefile.am @@ -8,7 +8,7 @@ dist_man_MANS = pam_canonicalize_user.8 endif XMLS = README.xml pam_canonicalize_user.8.xml dist_check_SCRIPTS = tst-pam_canonicalize_user -TESTS = $(dist_check_SCRIPTS) +TESTS = $(dist_check_SCRIPTS) $(check_PROGRAMS) securelibdir = $(SECUREDIR) if HAVE_VENDORDIR @@ -19,16 +19,17 @@ endif AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ $(WARN_CFLAGS) -AM_LDFLAGS = -no-undefined -avoid-version -module -if HAVE_VERSIONING - AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map -endif securelib_LTLIBRARIES = pam_canonicalize_user.la pam_canonicalize_user_la_LIBADD = $(top_builddir)/libpam/libpam.la +pam_canonicalize_user_la_LDFLAGS = -no-undefined -avoid-version -module +if HAVE_VERSIONING + pam_canonicalize_user_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map +endif check_PROGRAMS = tst-pam_canonicalize_user-retval tst_pam_canonicalize_user_retval_LDADD = $(top_builddir)/libpam/libpam.la +tst_pam_canonicalize_user_retval_LDFLAGS = -Wl,--export-dynamic if ENABLE_REGENERATE_MAN dist_noinst_DATA = README diff --git a/modules/pam_canonicalize_user/tst-pam_canonicalize_user-retval.c b/modules/pam_canonicalize_user/tst-pam_canonicalize_user-retval.c index 761aa310..a85a0043 100644 --- a/modules/pam_canonicalize_user/tst-pam_canonicalize_user-retval.c +++ b/modules/pam_canonicalize_user/tst-pam_canonicalize_user-retval.c @@ -87,7 +87,7 @@ main(void) pam_start_confdir(service_file, ":", &null_conv, ".", &pamh)); ASSERT_NE(NULL, pamh); ASSERT_EQ(PAM_USER_UNKNOWN, pam_authenticate(pamh, 0)); - ASSERT_EQ(PAM_USER_UNKNOWN, pam_setcred(pamh, 0)); + ASSERT_EQ(PAM_PERM_DENIED, pam_setcred(pamh, 0)); ASSERT_EQ(PAM_MODULE_UNKNOWN, pam_acct_mgmt(pamh, 0)); ASSERT_EQ(PAM_MODULE_UNKNOWN, pam_chauthtok(pamh, 0)); ASSERT_EQ(PAM_MODULE_UNKNOWN, pam_open_session(pamh, 0)); @@ -154,11 +154,11 @@ main(void) pam_start_confdir(service_file, NULL, &again_conv, ".", &pamh)); ASSERT_NE(NULL, pamh); ASSERT_EQ(PAM_INCOMPLETE, pam_authenticate(pamh, 0)); - ASSERT_EQ(PAM_INCOMPLETE, pam_setcred(pamh, 0)); - ASSERT_EQ(PAM_MODULE_UNKNOWN, pam_acct_mgmt(pamh, 0)); - ASSERT_EQ(PAM_MODULE_UNKNOWN, pam_chauthtok(pamh, 0)); - ASSERT_EQ(PAM_MODULE_UNKNOWN, pam_open_session(pamh, 0)); - ASSERT_EQ(PAM_MODULE_UNKNOWN, pam_close_session(pamh, 0)); + ASSERT_EQ(PAM_ABORT, pam_setcred(pamh, 0)); + ASSERT_EQ(PAM_ABORT, pam_acct_mgmt(pamh, 0)); + ASSERT_EQ(PAM_ABORT, pam_chauthtok(pamh, 0)); + ASSERT_EQ(PAM_ABORT, pam_open_session(pamh, 0)); + ASSERT_EQ(PAM_ABORT, pam_close_session(pamh, 0)); ASSERT_EQ(PAM_SUCCESS, pam_end(pamh, 0)); pamh = NULL; @@ -166,13 +166,13 @@ main(void) ASSERT_NE(NULL, fp = fopen(service_file, "w")); ASSERT_LT(0, fprintf(fp, "#%%PAM-1.0\n" "auth required %s/.libs/%s.so\n" - "auth required %s/../pam_succseed_if/.libs/pam_succseed_if.so user = root\n" + "auth required %s/../pam_succeed_if/.libs/pam_succeed_if.so user = root\n" "account required %s/.libs/%s.so\n" - "account required %s/../pam_succseed_if/.libs/pam_succseed_if.so user = root\n" + "account required %s/../pam_succeed_if/.libs/pam_succeed_if.so user = root\n" "password required %s/.libs/%s.so\n" - "password required %s/../pam_succseed_if/.libs/pam_succseed_if.so user = root\n" + "password required %s/../pam_succeed_if/.libs/pam_succeed_if.so user = root\n" "session required %s/.libs/%s.so\n" - "session required %s/../pam_succseed_if/.libs/pam_succseed_if.so user = root\n", + "session required %s/../pam_succeed_if/.libs/pam_succeed_if.so user = root\n", cwd, MODULE_NAME, cwd, cwd, MODULE_NAME, cwd, cwd, MODULE_NAME, cwd, @@ -183,7 +183,7 @@ main(void) pam_start_confdir(service_file, "ROOT", &null_conv, ".", &pamh)); ASSERT_NE(NULL, pamh); ASSERT_EQ(PAM_SUCCESS, pam_authenticate(pamh, 0)); - ASSERT_EQ(PAM_SUCCESS, pam_setcred(pamh, 0)); + ASSERT_EQ(PAM_PERM_DENIED, pam_setcred(pamh, 0)); ASSERT_EQ(PAM_MODULE_UNKNOWN, pam_acct_mgmt(pamh, 0)); ASSERT_EQ(PAM_MODULE_UNKNOWN, pam_chauthtok(pamh, 0)); ASSERT_EQ(PAM_MODULE_UNKNOWN, pam_open_session(pamh, 0)); |