fix up the patch so that pamh isn't undefined...

1 files changed, 50 insertions, 1 deletions

diff --git a/debian/patches-applied/pam_unix_thread-safe_save_old_password.patch b/debian/patches-applied/pam_unix_thread-safe_save_old_password.patch
index c5d578b6..094c63d2 100644
--- a/debian/patches-applied/pam_unix_thread-safe_save_old_password.patch
+++ b/debian/patches-applied/pam_unix_thread-safe_save_old_password.patch
@@ -10,7 +10,23 @@ Index: pam.deb/modules/pam_unix/passverify.c
 ===================================================================
 --- pam.deb.orig/modules/pam_unix/passverify.c
 +++ pam.deb/modules/pam_unix/passverify.c
-@@ -653,7 +653,7 @@
+@@ -535,9 +535,15 @@
+ }
+ #endif
+ 
++#ifdef HELPER_COMPILE
+ int
+ save_old_password(const char *forwho, const char *oldpass,
+ 		  int howmany)
++#else
++int
++save_old_password(pam_handle_t *pamh, const char *forwho, const char *oldpass,
++		  int howmany)
++#endif
+ {
+     static char buf[16384];
+     static char nbuf[16384];
+@@ -653,7 +659,7 @@
      fclose(opwfile);
  
      if (!found) {
@@ -19,3 +35,36 @@ Index: pam.deb/modules/pam_unix/passverify.c
  	if (pwd == NULL) {
  	    err = 1;
  	} else {
+Index: pam.deb/modules/pam_unix/passverify.h
+===================================================================
+--- pam.deb.orig/modules/pam_unix/passverify.h
++++ pam.deb/modules/pam_unix/passverify.h
+@@ -33,9 +33,15 @@
+ void
+ unlock_pwdf(void);
+ 
++#ifdef HELPER_COMPILE
+ int
+ save_old_password(const char *forwho, const char *oldpass,
+ 		  int howmany);
++#else
++int
++save_old_password(pam_handle_t *pamh, const char *forwho, const char *oldpass,
++		  int howmany);
++#endif
+ 
+ #ifdef HELPER_COMPILE
+ void
+Index: pam.deb/modules/pam_unix/pam_unix_passwd.c
+===================================================================
+--- pam.deb.orig/modules/pam_unix/pam_unix_passwd.c
++++ pam.deb/modules/pam_unix/pam_unix_passwd.c
+@@ -385,7 +385,7 @@
+ 			  return _unix_run_update_binary(pamh, ctrl, forwho, fromwhat, towhat, remember);
+ #endif
+ 		/* first, save old password */
+-		if (save_old_password(forwho, fromwhat, remember)) {
++		if (save_old_password(pamh, forwho, fromwhat, remember)) {
+ 			retval = PAM_AUTHTOK_ERR;
+ 			goto done;
+ 		}