commit 587b47b56e6b85f4459dd6a0d7fd42498792444b Author: Marcin Krol <h...@tld-linux.org> Date: Sun Mar 21 13:31:53 2021 +0100
- rediffed pam-exec-failok.patch | 38 +++++++++++++++++++------------------- pam-pld-modules.patch | 16 +++++++++------- pam-tally-fail-close.patch | 15 ++++++++------- 3 files changed, 36 insertions(+), 33 deletions(-) --- diff --git a/pam-exec-failok.patch b/pam-exec-failok.patch index 2018a41..953be16 100644 --- a/pam-exec-failok.patch +++ b/pam-exec-failok.patch @@ -1,7 +1,8 @@ ---- Linux-PAM-0.99.7.1/modules/pam_exec/pam_exec.8.xml~ 2006-06-09 18:44:06.000000000 +0200 -+++ Linux-PAM-0.99.7.1/modules/pam_exec/pam_exec.8.xml 2007-02-09 22:35:07.000000000 +0100 -@@ -25,6 +25,9 @@ - quiet +diff -urNp -x '*.orig' Linux-PAM-1.4.0.org/modules/pam_exec/pam_exec.8.xml Linux-PAM-1.4.0/modules/pam_exec/pam_exec.8.xml +--- Linux-PAM-1.4.0.org/modules/pam_exec/pam_exec.8.xml 2020-06-08 12:17:27.000000000 +0200 ++++ Linux-PAM-1.4.0/modules/pam_exec/pam_exec.8.xml 2021-03-21 13:20:06.503594925 +0100 +@@ -34,6 +34,9 @@ + stdout </arg> <arg choice="opt"> + failok @@ -9,11 +10,12 @@ + <arg choice="opt"> log=<replaceable>file</replaceable> </arg> - <arg choice="plain"> -@@ -90,6 +93,18 @@ + <arg choice="opt"> +@@ -172,6 +175,18 @@ + </para> </listitem> </varlistentry> - ++ + <varlistentry> + <term> + <option>failok</option> @@ -25,21 +27,21 @@ + </para> + </listitem> + </varlistentry> -+ + </variablelist> - </para> ---- Linux-PAM-0.99.7.1/modules/pam_exec/pam_exec.c.orig 2007-02-09 22:30:39.000000000 +0100 -+++ Linux-PAM-0.99.7.1/modules/pam_exec/pam_exec.c 2007-02-09 22:37:07.000000000 +0100 -@@ -64,6 +64,7 @@ +diff -urNp -x '*.orig' Linux-PAM-1.4.0.org/modules/pam_exec/pam_exec.c Linux-PAM-1.4.0/modules/pam_exec/pam_exec.c +--- Linux-PAM-1.4.0.org/modules/pam_exec/pam_exec.c 2020-06-08 12:17:27.000000000 +0200 ++++ Linux-PAM-1.4.0/modules/pam_exec/pam_exec.c 2021-03-21 13:20:06.504594925 +0100 +@@ -93,6 +93,7 @@ call_exec (const char *pam_type, pam_han int debug = 0; int call_setuid = 0; int quiet = 0; + int fail_ok = 0; int expose_authtok = 0; + int use_stdout = 0; int optargc; - const char *logfile = NULL; -@@ -85,6 +86,8 @@ +@@ -135,6 +136,8 @@ call_exec (const char *pam_type, pam_han quiet = 1; else if (strcasecmp (argv[optargc], "expose_authtok") == 0) expose_authtok = 1; @@ -48,7 +50,7 @@ else break; /* Unknown option, assume program to execute. */ } -@@ -115,29 +118,32 @@ +@@ -271,7 +274,7 @@ call_exec (const char *pam_type, pam_han { pam_syslog (pamh, LOG_ERR, "%s failed: exit code %d", argv[optargc], WEXITSTATUS(status)); @@ -57,8 +59,7 @@ pam_error (pamh, _("%s failed: exit code %d"), argv[optargc], WEXITSTATUS(status)); } - else if (WIFSIGNALED(status)) - { +@@ -280,7 +283,7 @@ call_exec (const char *pam_type, pam_han pam_syslog (pamh, LOG_ERR, "%s failed: caught signal %d%s", argv[optargc], WTERMSIG(status), WCOREDUMP(status) ? " (core dumped)" : ""); @@ -67,8 +68,7 @@ pam_error (pamh, _("%s failed: caught signal %d%s"), argv[optargc], WTERMSIG(status), WCOREDUMP(status) ? " (core dumped)" : ""); - } - else +@@ -289,11 +292,14 @@ call_exec (const char *pam_type, pam_han { pam_syslog (pamh, LOG_ERR, "%s failed: unknown status 0x%x", argv[optargc], status); diff --git a/pam-pld-modules.patch b/pam-pld-modules.patch index 9b09e93..bc71fab 100644 --- a/pam-pld-modules.patch +++ b/pam-pld-modules.patch @@ -1,17 +1,19 @@ ---- Linux-PAM-0.99.5.0/configure.in.redhat-modules 2006-06-28 09:25:02.000000000 +0200 -+++ Linux-PAM-0.99.5.0/configure.ac 2006-06-30 10:24:35.000000000 +0200 -@@ -492,6 +492,8 @@ - libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \ +diff -urNp -x '*.orig' Linux-PAM-1.4.0.org/configure.ac Linux-PAM-1.4.0/configure.ac +--- Linux-PAM-1.4.0.org/configure.ac 2020-06-08 12:17:27.000000000 +0200 ++++ Linux-PAM-1.4.0/configure.ac 2021-03-21 13:19:44.088594925 +0100 +@@ -712,6 +712,8 @@ AC_CONFIG_FILES([Makefile libpam/Makefil po/Makefile.in \ + Make.xml.rules \ modules/Makefile \ + modules/pam_console/Makefile modules/pam_pwexport/Makefile \ + modules/pam_pwgen/Makefile modules/pam_rps/Makefile \ modules/pam_access/Makefile modules/pam_cracklib/Makefile \ modules/pam_debug/Makefile modules/pam_deny/Makefile \ modules/pam_echo/Makefile modules/pam_env/Makefile \ ---- Linux-PAM-1.4.0/modules/Makefile.am.orig 2020-08-25 19:33:40.370451732 +0200 -+++ Linux-PAM-1.4.0/modules/Makefile.am 2020-08-25 19:35:12.873283934 +0200 -@@ -98,6 +98,10 @@ +diff -urNp -x '*.orig' Linux-PAM-1.4.0.org/modules/Makefile.am Linux-PAM-1.4.0/modules/Makefile.am +--- Linux-PAM-1.4.0.org/modules/Makefile.am 2020-06-08 12:17:27.000000000 +0200 ++++ Linux-PAM-1.4.0/modules/Makefile.am 2021-03-21 13:19:44.089594925 +0100 +@@ -98,6 +98,10 @@ SUBDIRS := \ pam_warn \ pam_wheel \ pam_xauth \ diff --git a/pam-tally-fail-close.patch b/pam-tally-fail-close.patch index db37398..2f0fa5d 100644 --- a/pam-tally-fail-close.patch +++ b/pam-tally-fail-close.patch @@ -1,6 +1,7 @@ ---- Linux-PAM-0.99.3.0/modules/pam_tally/pam_tally.c.fail-close 2005-09-21 15:35:29.000000000 +0200 -+++ Linux-PAM-0.99.3.0/modules/pam_tally/pam_tally.c 2006-05-04 13:31:59.000000000 +0200 -@@ -318,6 +318,7 @@ +diff -urNp -x '*.orig' Linux-PAM-1.4.0.org/modules/pam_tally/pam_tally.c Linux-PAM-1.4.0/modules/pam_tally/pam_tally.c +--- Linux-PAM-1.4.0.org/modules/pam_tally/pam_tally.c 2020-06-08 12:17:27.000000000 +0200 ++++ Linux-PAM-1.4.0/modules/pam_tally/pam_tally.c 2021-03-21 13:19:54.832594925 +0100 +@@ -320,6 +320,7 @@ get_tally(pam_handle_t *pamh, tally_t *t } lstat_ret = fstat(fileno(*TALLY),&fileinfo); fclose(*TALLY); @@ -8,16 +9,16 @@ } if ( lstat_ret ) { -@@ -348,6 +349,7 @@ - if ( fseek( *TALLY, uid * sizeof(struct faillog), SEEK_SET ) ) { +@@ -350,6 +351,7 @@ get_tally(pam_handle_t *pamh, tally_t *t + if ( fseeko( *TALLY, (off_t) uid * sizeof(struct faillog), SEEK_SET ) ) { pam_syslog(pamh, LOG_ALERT, "fseek failed for %s", filename); fclose(*TALLY); + *TALLY = NULL; return PAM_AUTH_ERR; } -@@ -394,6 +396,7 @@ - } +@@ -398,6 +400,7 @@ set_tally(pam_handle_t *pamh, tally_t ta + } if ( fclose(*TALLY) ) { + *TALLY = NULL; ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/pam.git/commitdiff/587b47b56e6b85f4459dd6a0d7fd42498792444b _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit