nss-pam-ldapd commit: r1677 - nss-pam-ldapd/compat

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Wed May  2 23:11:28 2012
New Revision: 1677
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1677&view=revision

Log:
move all PAM_AUTHTOK_RECOVERY_ERR compatibility definitions to 
compat/pam_compat.h

Modified:
   nss-pam-ldapd/compat/pam_compat.h
   nss-pam-ldapd/compat/pam_get_authtok.c

Modified: nss-pam-ldapd/compat/pam_compat.h
==============================================================================
--- nss-pam-ldapd/compat/pam_compat.h   Wed May  2 22:52:36 2012        (r1676)
+++ nss-pam-ldapd/compat/pam_compat.h   Wed May  2 23:11:28 2012        (r1677)
@@ -37,12 +37,13 @@
 #include <security/pam_modutil.h>
 #endif /* HAVE_SECURITY_PAM_MODUTIL_H */
 
-/* some systems define PAM_AUTHTOK_RECOVER_ERR but not
-   PAM_AUTHTOK_RECOVERY_ERR */
+/* find value of PAM_AUTHTOK_RECOVERY_ERR */
 #ifndef PAM_AUTHTOK_RECOVERY_ERR
 #ifdef PAM_AUTHTOK_RECOVER_ERR
 #define PAM_AUTHTOK_RECOVERY_ERR PAM_AUTHTOK_RECOVER_ERR
-#endif /* PAM_AUTHTOK_RECOVER_ERR */
+#else
+#define PAM_AUTHTOK_RECOVERY_ERR 21 /* not defined anywhere */
+#endif
 #endif /* not PAM_AUTHTOK_RECOVERY_ERR */
 
 /* define our own replacement pam_get_authtok() if it wasn't found */

Modified: nss-pam-ldapd/compat/pam_get_authtok.c
==============================================================================
--- nss-pam-ldapd/compat/pam_get_authtok.c      Wed May  2 22:52:36 2012        
(r1676)
+++ nss-pam-ldapd/compat/pam_get_authtok.c      Wed May  2 23:11:28 2012        
(r1677)
@@ -35,15 +35,6 @@
 
 /* warning: this version assumes that try_first_pass is specified */
 
-/* find value of PAM_AUTHTOK_RECOVERY_ERR */
-#ifndef PAM_AUTHTOK_RECOVERY_ERR
-#ifdef PAM_AUTHTOK_RECOVER_ERR
-#define PAM_AUTHTOK_RECOVERY_ERR PAM_AUTHTOK_RECOVER_ERR
-#else
-#define PAM_AUTHTOK_RECOVERY_ERR 21 /* not defined anywhere */
-#endif
-#endif
-
 int pam_get_authtok(pam_handle_t *pamh,int item,const char **authtok,const 
char *prompt)
 {
   int rc;
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/