From 1814aec611a5f9e03eceee81237ad3a3f51c954a Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Wed, 26 Oct 2011 23:56:54 +0000 Subject: Fix whitespace issues Cleanup trailing whitespaces, indentation that uses spaces before tabs, and blank lines at EOF. Make the project free of warnings reported by git diff --check 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD --- xtests/group.conf | 1 - xtests/tst-pam_access1.pamd | 1 - xtests/tst-pam_access2.pamd | 1 - xtests/tst-pam_access3.pamd | 1 - xtests/tst-pam_access4.pamd | 1 - xtests/tst-pam_authfail.c | 4 ++-- xtests/tst-pam_authsucceed.c | 4 ++-- xtests/tst-pam_dispatch3.pamd | 1 - xtests/tst-pam_group1.pamd | 1 - xtests/tst-pam_limits1.pamd | 1 - xtests/tst-pam_pwhistory1.pamd | 1 - xtests/tst-pam_substack1.pamd | 2 +- xtests/tst-pam_unix1.pamd | 1 - xtests/tst-pam_unix2.pamd | 1 - xtests/tst-pam_unix3.pamd | 1 - xtests/tst-pam_unix4.pamd | 1 - 16 files changed, 5 insertions(+), 18 deletions(-) (limited to 'xtests') diff --git a/xtests/group.conf b/xtests/group.conf index 04fe3ef7..2cb34877 100644 --- a/xtests/group.conf +++ b/xtests/group.conf @@ -1,3 +1,2 @@ tst-pam_group1;tty1;tstpamgrp;Al0000-2400;tstpamgrpg - diff --git a/xtests/tst-pam_access1.pamd b/xtests/tst-pam_access1.pamd index f47ec34f..a70f2d9c 100644 --- a/xtests/tst-pam_access1.pamd +++ b/xtests/tst-pam_access1.pamd @@ -3,4 +3,3 @@ auth required pam_access.so nodefgroup account required pam_permit.so password required pam_permit.so session required pam_permit.so - diff --git a/xtests/tst-pam_access2.pamd b/xtests/tst-pam_access2.pamd index f47ec34f..a70f2d9c 100644 --- a/xtests/tst-pam_access2.pamd +++ b/xtests/tst-pam_access2.pamd @@ -3,4 +3,3 @@ auth required pam_access.so nodefgroup account required pam_permit.so password required pam_permit.so session required pam_permit.so - diff --git a/xtests/tst-pam_access3.pamd b/xtests/tst-pam_access3.pamd index f47ec34f..a70f2d9c 100644 --- a/xtests/tst-pam_access3.pamd +++ b/xtests/tst-pam_access3.pamd @@ -3,4 +3,3 @@ auth required pam_access.so nodefgroup account required pam_permit.so password required pam_permit.so session required pam_permit.so - diff --git a/xtests/tst-pam_access4.pamd b/xtests/tst-pam_access4.pamd index f47ec34f..a70f2d9c 100644 --- a/xtests/tst-pam_access4.pamd +++ b/xtests/tst-pam_access4.pamd @@ -3,4 +3,3 @@ auth required pam_access.so nodefgroup account required pam_permit.so password required pam_permit.so session required pam_permit.so - diff --git a/xtests/tst-pam_authfail.c b/xtests/tst-pam_authfail.c index afdbd6a4..0e7d8087 100644 --- a/xtests/tst-pam_authfail.c +++ b/xtests/tst-pam_authfail.c @@ -60,14 +60,14 @@ main(int argc, char *argv[]) if (argc > 2) { stack = argv[2]; } - + if (argc > 1) { if (strcmp (argv[1], "-d") == 0) debug = 1; else stack = argv[1]; } - + retval = pam_start(stack, user, &conv, &pamh); if (retval != PAM_SUCCESS) diff --git a/xtests/tst-pam_authsucceed.c b/xtests/tst-pam_authsucceed.c index 8666f3f7..c0ee8023 100644 --- a/xtests/tst-pam_authsucceed.c +++ b/xtests/tst-pam_authsucceed.c @@ -60,14 +60,14 @@ main(int argc, char *argv[]) if (argc > 2) { stack = argv[2]; } - + if (argc > 1) { if (strcmp (argv[1], "-d") == 0) debug = 1; else stack = argv[1]; } - + retval = pam_start(stack, user, &conv, &pamh); if (retval != PAM_SUCCESS) diff --git a/xtests/tst-pam_dispatch3.pamd b/xtests/tst-pam_dispatch3.pamd index 8172c5f2..7f290aba 100644 --- a/xtests/tst-pam_dispatch3.pamd +++ b/xtests/tst-pam_dispatch3.pamd @@ -3,4 +3,3 @@ auth optional pam_debug.so auth=auth_err auth sufficient pam_debug.so auth=success auth required pam_debug.so auth=perm_denied account required pam_debug.so acct=acct_expired - diff --git a/xtests/tst-pam_group1.pamd b/xtests/tst-pam_group1.pamd index d78f3a6c..e75d0d1c 100644 --- a/xtests/tst-pam_group1.pamd +++ b/xtests/tst-pam_group1.pamd @@ -4,4 +4,3 @@ auth required pam_permit.so account required pam_permit.so password required pam_permit.so session required pam_permit.so - diff --git a/xtests/tst-pam_limits1.pamd b/xtests/tst-pam_limits1.pamd index 206ef1f7..7b1771c4 100644 --- a/xtests/tst-pam_limits1.pamd +++ b/xtests/tst-pam_limits1.pamd @@ -3,4 +3,3 @@ auth required pam_permit.so account required pam_permit.so password required pam_permit.so session required pam_limits.so - diff --git a/xtests/tst-pam_pwhistory1.pamd b/xtests/tst-pam_pwhistory1.pamd index e096cc4f..68e1b942 100644 --- a/xtests/tst-pam_pwhistory1.pamd +++ b/xtests/tst-pam_pwhistory1.pamd @@ -4,4 +4,3 @@ account required pam_permit.so password required pam_pwhistory.so remember=10 retry=1 password required pam_unix.so use_authtok md5 session required pam_permit.so - diff --git a/xtests/tst-pam_substack1.pamd b/xtests/tst-pam_substack1.pamd index 6eab233e..8dfe1b82 100644 --- a/xtests/tst-pam_substack1.pamd +++ b/xtests/tst-pam_substack1.pamd @@ -1,5 +1,5 @@ #%PAM-1.0 -# Even if the substack succeeds with sufficient +# Even if the substack succeeds with sufficient # the whole stack should fail. auth substack tst-pam_substack1a auth required pam_debug.so auth=auth_err diff --git a/xtests/tst-pam_unix1.pamd b/xtests/tst-pam_unix1.pamd index 1a2990c7..6cd67b6a 100644 --- a/xtests/tst-pam_unix1.pamd +++ b/xtests/tst-pam_unix1.pamd @@ -3,4 +3,3 @@ auth required pam_unix.so account required pam_unix.so password required pam_unix.so session required pam_unix.so - diff --git a/xtests/tst-pam_unix2.pamd b/xtests/tst-pam_unix2.pamd index 1a2990c7..6cd67b6a 100644 --- a/xtests/tst-pam_unix2.pamd +++ b/xtests/tst-pam_unix2.pamd @@ -3,4 +3,3 @@ auth required pam_unix.so account required pam_unix.so password required pam_unix.so session required pam_unix.so - diff --git a/xtests/tst-pam_unix3.pamd b/xtests/tst-pam_unix3.pamd index 1a2990c7..6cd67b6a 100644 --- a/xtests/tst-pam_unix3.pamd +++ b/xtests/tst-pam_unix3.pamd @@ -3,4 +3,3 @@ auth required pam_unix.so account required pam_unix.so password required pam_unix.so session required pam_unix.so - diff --git a/xtests/tst-pam_unix4.pamd b/xtests/tst-pam_unix4.pamd index 4dc414fc..1affa8e1 100644 --- a/xtests/tst-pam_unix4.pamd +++ b/xtests/tst-pam_unix4.pamd @@ -3,4 +3,3 @@ auth required pam_unix.so account required pam_unix.so password required pam_unix.so debug session required pam_unix.so - -- cgit v1.2.3 From c9c4faaf50c66d5e4d1b9d6c450c206c12f09f8a Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 27 Oct 2011 14:55:55 +0000 Subject: Rename all .cvsignore files to .gitignore --- xtests/.cvsignore | 26 -------------------------- xtests/.gitignore | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 xtests/.cvsignore create mode 100644 xtests/.gitignore (limited to 'xtests') diff --git a/xtests/.cvsignore b/xtests/.cvsignore deleted file mode 100644 index 52af6ddf..00000000 --- a/xtests/.cvsignore +++ /dev/null @@ -1,26 +0,0 @@ -Makefile -Makefile.in -.deps -.libs -tst-pam_access1 -tst-pam_access2 -tst-pam_access3 -tst-pam_access4 -tst-pam_dispatch1 -tst-pam_dispatch2 -tst-pam_dispatch3 -tst-pam_dispatch4 -tst-pam_dispatch5 -tst-pam_cracklib1 -tst-pam_cracklib2 -tst-pam_limits1 -tst-pam_unix1 -tst-pam_unix2 -tst-pam_unix3 -tst-pam_unix4 -tst-pam_succeed_if1 -tst-pam_group1 -tst-pam_authfail -tst-pam_authsucceed -tst-pam_pwhistory1 -tst-pam_time1 diff --git a/xtests/.gitignore b/xtests/.gitignore new file mode 100644 index 00000000..52af6ddf --- /dev/null +++ b/xtests/.gitignore @@ -0,0 +1,26 @@ +Makefile +Makefile.in +.deps +.libs +tst-pam_access1 +tst-pam_access2 +tst-pam_access3 +tst-pam_access4 +tst-pam_dispatch1 +tst-pam_dispatch2 +tst-pam_dispatch3 +tst-pam_dispatch4 +tst-pam_dispatch5 +tst-pam_cracklib1 +tst-pam_cracklib2 +tst-pam_limits1 +tst-pam_unix1 +tst-pam_unix2 +tst-pam_unix3 +tst-pam_unix4 +tst-pam_succeed_if1 +tst-pam_group1 +tst-pam_authfail +tst-pam_authsucceed +tst-pam_pwhistory1 +tst-pam_time1 -- cgit v1.2.3 From 3e7fb3233efe776d867be9d34b4b6e83ec59df86 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 27 Oct 2011 14:55:55 +0000 Subject: Update .gitignore files * .gitignore: Add common ignore patterns. * m4/.gitignore: Unignore local m4 files. * dynamic/.gitignore: Unignore Makefile. * libpamc/test/modules/.gitignore: Likewise. * libpamc/test/regress/.gitignore: Likewise. * po/.gitignore: Add Makevars.template. * conf/.gitignore: Remove common ignore patterns. * conf/pam_conv1/.gitignore: Likewise. * doc/.gitignore: Likewise. * doc/specs/.gitignore: Likewise. * doc/specs/formatter/.gitignore: Likewise. * examples/.gitignore: Likewise. * modules/pam_filter/upperLOWER/.gitignore: Likewise. * modules/pam_mkhomedir/.gitignore: Likewise. * modules/pam_selinux/.gitignore: Likewise. * modules/pam_stress/.gitignore: Likewise. * modules/pam_tally/.gitignore: Likewise. * modules/pam_tally2/.gitignore: Likewise. * modules/pam_timestamp/.gitignore: Likewise. * modules/pam_unix/.gitignore: Likewise. * tests/.gitignore: Likewise. * xtests/.gitignore: Likewise. * doc/adg/.gitignore: Remove. * doc/man/.gitignore: Remove. * doc/mwg/.gitignore: Remove. * doc/sag/.gitignore: Remove. * libpamc/.gitignore: Remove. * libpamc/test/.gitignore: Remove. * libpam/.gitignore: Remove. * libpam_misc/.gitignore: Remove. * modules/.gitignore: Remove. * modules/pam_access/.gitignore: Remove. * modules/pam_cracklib/.gitignore: Remove. * modules/pam_debug/.gitignore: Remove. * modules/pam_deny/.gitignore: Remove. * modules/pam_echo/.gitignore: Remove. * modules/pam_env/.gitignore: Remove. * modules/pam_exec/.gitignore: Remove. * modules/pam_faildelay/.gitignore: Remove. * modules/pam_filter/.gitignore: Remove. * modules/pam_ftp/.gitignore: Remove. * modules/pam_group/.gitignore: Remove. * modules/pam_issue/.gitignore: Remove. * modules/pam_keyinit/.gitignore: Remove. * modules/pam_lastlog/.gitignore: Remove. * modules/pam_limits/.gitignore: Remove. * modules/pam_listfile/.gitignore: Remove. * modules/pam_localuser/.gitignore: Remove. * modules/pam_loginuid/.gitignore: Remove. * modules/pam_mail/.gitignore: Remove. * modules/pam_motd/.gitignore: Remove. * modules/pam_namespace/.gitignore: Remove. * modules/pam_nologin/.gitignore: Remove. * modules/pam_permit/.gitignore: Remove. * modules/pam_pwhistory/.gitignore: Remove. * modules/pam_rhosts/.gitignore: Remove. * modules/pam_rootok/.gitignore: Remove. * modules/pam_securetty/.gitignore: Remove. * modules/pam_sepermit/.gitignore: Remove. * modules/pam_shells/.gitignore: Remove. * modules/pam_succeed_if/.gitignore: Remove. * modules/pam_time/.gitignore: Remove. * modules/pam_tty_audit/.gitignore: Remove. * modules/pam_umask/.gitignore: Remove. * modules/pam_userdb/.gitignore: Remove. * modules/pam_warn/.gitignore: Remove. * modules/pam_wheel/.gitignore: Remove. * modules/pam_xauth/.gitignore: Remove. --- xtests/.gitignore | 4 ---- 1 file changed, 4 deletions(-) (limited to 'xtests') diff --git a/xtests/.gitignore b/xtests/.gitignore index 52af6ddf..0ef12896 100644 --- a/xtests/.gitignore +++ b/xtests/.gitignore @@ -1,7 +1,3 @@ -Makefile -Makefile.in -.deps -.libs tst-pam_access1 tst-pam_access2 tst-pam_access3 -- cgit v1.2.3 From 61a6b8c8e850ec1589e01accf15f3bce2c80d494 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 28 Oct 2011 02:20:17 +0000 Subject: Fix usage of LIBADD, LDADD and LDFLAGS * modules/pam_selinux/Makefile.am: Rename pam_selinux_check_LDFLAGS to pam_selinux_check_LDADD. * modules/pam_userdb/Makefile.am: Split out pam_userdb_la_LIBADD from AM_LDFLAGS. * modules/pam_warn/Makefile.am: Split out pam_warn_la_LIBADD from AM_LDFLAGS. * modules/pam_wheel/Makefile.am: Split out pam_wheel_la_LIBADD from AM_LDFLAGS. * modules/pam_xauth/Makefile.am: split out pam_xauth_la_LIBADD from AM_LDFLAGS. * xtests/Makefile.am: Rename AM_LDFLAGS to LDADD. --- xtests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xtests') diff --git a/xtests/Makefile.am b/xtests/Makefile.am index 498a9fca..904b536a 100644 --- a/xtests/Makefile.am +++ b/xtests/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \ -I$(top_srcdir)/libpamc/include -I$(top_srcdir)/libpam_misc/include -AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \ +LDADD = -L$(top_builddir)/libpam -lpam \ -L$(top_builddir)/libpam_misc -lpam_misc CLEANFILES = *~ $(XTESTS) -- cgit v1.2.3 From dc8b23cf9228ed432e9b7b2ee2209a06283241c0 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 28 Oct 2011 02:28:38 +0000 Subject: Use libpam.la/libpam_misc.la to link with -lpam/-lpam_misc GNU automake documentation recommends to avoid using -l options in LDADD or LIBADD when referring to libraries built by the package. Instead, it recommends to write the file name of the library explicitly, and use -l option only to list third-party libraries. As result, the default value of *_DEPENDENCIES will list all local libraries and omit the other ones. * modules/pam_access/Makefile.am (pam_access_la_LIBADD): Replace "-L$(top_builddir)/libpam -lpam" with "$(top_builddir)/libpam/libpam.la", to follow GNU automake recommendations. * modules/pam_cracklib/Makefile.am (pam_cracklib_la_LIBADD): Likewise. * modules/pam_debug/Makefile.am (pam_debug_la_LIBADD): Likewise. * modules/pam_deny/Makefile.am (pam_deny_la_LIBADD): Likewise. * modules/pam_echo/Makefile.am (pam_echo_la_LIBADD): Likewise. * modules/pam_env/Makefile.am (pam_env_la_LIBADD): Likewise. * modules/pam_exec/Makefile.am (pam_exec_la_LIBADD): Likewise. * modules/pam_faildelay/Makefile.am (pam_faildelay_la_LIBADD): Likewise. * modules/pam_filter/Makefile.am (pam_filter_la_LIBADD): Likewise. * modules/pam_filter/upperLOWER/Makefile.am (LDADD): Likewise. * modules/pam_ftp/Makefile.am (pam_ftp_la_LIBADD): Likewise. * modules/pam_group/Makefile.am (pam_group_la_LIBADD): Likewise. * modules/pam_issue/Makefile.am (pam_issue_la_LIBADD): Likewise. * modules/pam_keyinit/Makefile.am (pam_keyinit_la_LIBADD): Likewise. * modules/pam_lastlog/Makefile.am (pam_lastlog_la_LIBADD): Likewise. * modules/pam_limits/Makefile.am (pam_limits_la_LIBADD): Likewise. * modules/pam_listfile/Makefile.am (pam_listfile_la_LIBADD): Likewise. * modules/pam_localuser/Makefile.am (pam_localuser_la_LIBADD): Likewise. * modules/pam_loginuid/Makefile.am (pam_loginuid_la_LIBADD): Likewise. * modules/pam_mail/Makefile.am (pam_mail_la_LIBADD): Likewise. * modules/pam_mkhomedir/Makefile.am (pam_mkhomedir_la_LIBADD, mkhomedir_helper_LDADD): Likewise. * modules/pam_motd/Makefile.am (pam_motd_la_LIBADD): Likewise. * modules/pam_namespace/Makefile.am (pam_namespace_la_LIBADD): Likewise. * modules/pam_nologin/Makefile.am (pam_nologin_la_LIBADD): Likewise. * modules/pam_permit/Makefile.am (pam_permit_la_LIBADD): Likewise. * modules/pam_pwhistory/Makefile.am (pam_pwhistory_la_LIBADD): Likewise. * modules/pam_rhosts/Makefile.am (pam_rhosts_la_LIBADD): Likewise. * modules/pam_rootok/Makefile.am (pam_rootok_la_LIBADD): Likewise. * modules/pam_securetty/Makefile.am (pam_securetty_la_LIBADD): Likewise. * modules/pam_sepermit/Makefile.am (pam_sepermit_la_LIBADD): Likewise. * modules/pam_shells/Makefile.am (pam_shells_la_LIBADD): Likewise. * modules/pam_stress/Makefile.am (pam_stress_la_LIBADD): Likewise. * modules/pam_succeed_if/Makefile.am (pam_succeed_if_la_LIBADD): Likewise. * modules/pam_tally/Makefile.am (pam_tally_la_LIBADD): Likewise. * modules/pam_tally2/Makefile.am (pam_tally2_la_LIBADD, pam_tally2_LDADD): Likewise. * modules/pam_time/Makefile.am (pam_time_la_LIBADD): Likewise. * modules/pam_timestamp/Makefile.am (pam_timestamp_la_LIBADD, pam_timestamp_check_LDADD, hmacfile_LDADD): Likewise. * modules/pam_tty_audit/Makefile.am (pam_tty_audit_la_LIBADD): Likewise. * modules/pam_umask/Makefile.am (pam_umask_la_LIBADD): Likewise. * modules/pam_unix/Makefile.am (pam_unix_la_LIBADD): Likewise. * modules/pam_userdb/Makefile.am (pam_userdb_la_LIBADD): Likewise. * modules/pam_warn/Makefile.am (pam_warn_la_LIBADD): Likewise. * modules/pam_wheel/Makefile.am (pam_wheel_la_LIBADD): Likewise. * modules/pam_xauth/Makefile.am (pam_xauth_la_LIBADD): Likewise. * tests/Makefile.am (LDADD): Likewise. * examples/Makefile.am (LDADD): Replace "-L$(top_builddir)/libpam -lpam" with "$(top_builddir)/libpam/libpam.la", and "-L$(top_builddir)/libpam_misc -lpam_misc" with "$(top_builddir)/libpam_misc/libpam_misc.la", to follow GNU automake recommendations. * xtests/Makefile.am (LDADD): Likewise. * modules/pam_selinux/Makefile.am (pam_selinux_la_LIBADD): Likewise. --- xtests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xtests') diff --git a/xtests/Makefile.am b/xtests/Makefile.am index 904b536a..a6d6f8db 100644 --- a/xtests/Makefile.am +++ b/xtests/Makefile.am @@ -4,8 +4,8 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \ -I$(top_srcdir)/libpamc/include -I$(top_srcdir)/libpam_misc/include -LDADD = -L$(top_builddir)/libpam -lpam \ - -L$(top_builddir)/libpam_misc -lpam_misc +LDADD = $(top_builddir)/libpam/libpam.la \ + $(top_builddir)/libpam_misc/libpam_misc.la CLEANFILES = *~ $(XTESTS) -- cgit v1.2.3 From bd07ad3adc626f842a4391d256541883426fd389 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 13 Nov 2012 09:19:05 +0100 Subject: Reflect the enforce_for_root semantics change in pam_pwhistory xtest. xtests/tst-pam_pwhistory1.pamd: Use enforce_for_root as the test is running with real uid == 0. --- xtests/tst-pam_pwhistory1.pamd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xtests') diff --git a/xtests/tst-pam_pwhistory1.pamd b/xtests/tst-pam_pwhistory1.pamd index 68e1b942..d60db7cb 100644 --- a/xtests/tst-pam_pwhistory1.pamd +++ b/xtests/tst-pam_pwhistory1.pamd @@ -1,6 +1,6 @@ #%PAM-1.0 auth required pam_permit.so account required pam_permit.so -password required pam_pwhistory.so remember=10 retry=1 +password required pam_pwhistory.so remember=10 retry=1 enforce_for_root password required pam_unix.so use_authtok md5 session required pam_permit.so -- cgit v1.2.3