- updated to 1.5.3

[packages/pam.git] / pam-exec-failok.patch

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" rep="norepeat">
+        failok
+      </arg>
+      <arg choice="opt" rep="norepeat">
         log=<replaceable>file</replaceable>
       </arg>
       <arg choice="opt" rep="norepeat">
@@ -172,6 +175,18 @@
             </para>
           </listitem>
         </varlistentry>
+
+        <varlistentry>
+          <term>
+            <option>failok</option>
+          </term>
+          <listitem>
+            <para>
+              Return success regardles of the exit code returned
+              by the command.
+            </para>
+          </listitem>
+        </varlistentry>
 
       </variablelist>
 
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 call_setuid = 0;
   int quiet = 0;
   int quiet_log = 0;
+  int fail_ok = 0;
   int expose_authtok = 0;
   int use_stdout = 0;
   int optargc;
@@ -135,6 +136,8 @@ call_exec (const char *pam_type, pam_han
 	quiet_log = 1;
       else if (strcasecmp (argv[optargc], "expose_authtok") == 0)
 	expose_authtok = 1;
+      else if (strcasecmp (argv[optargc], "failok") == 0)
+	fail_ok = 1;
       else
 	break; /* Unknown option, assume program to execute. */
     }
@@ -271,7 +274,7 @@ call_exec (const char *pam_type, pam_han
 		if (!quiet_log)
 	      pam_syslog (pamh, LOG_ERR, "%s failed: exit code %d",
 			  argv[optargc], WEXITSTATUS(status));
-		if (!quiet)
+		if (!quiet && !fail_ok)
 	      pam_error (pamh, _("%s failed: exit code %d"),
 			 argv[optargc], WEXITSTATUS(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)" : "");
-		if (!quiet)
+		if (!quiet && !fail_ok)
 	      pam_error (pamh, _("%s failed: caught signal %d%s"),
 			 argv[optargc], WTERMSIG(status),
 			 WCOREDUMP(status) ? " (core dumped)" : "");
@@ -289,11 +292,14 @@ call_exec (const char *pam_type, pam_han
 		if (!quiet_log)
 	      pam_syslog (pamh, LOG_ERR, "%s failed: unknown status 0x%x",
 			  argv[optargc], status);
-		if (!quiet)
+		if (!quiet && !fail_ok)
 	      pam_error (pamh, _("%s failed: unknown status 0x%x"),
 			 argv[optargc], status);
 	    }
-	  return PAM_SYSTEM_ERR;
+	  if (!fail_ok)
+	    return PAM_SYSTEM_ERR;
+	  else
+	    return PAM_SUCCESS;
 	}
       return PAM_SUCCESS;
     }