diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2012-05-02 21:11:28 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2012-05-02 21:11:28 +0000 |
| commit | c5aef9868c5c703a3e9682300068407f17e517a3 (patch) | |
| tree | 1987b0d09e69e3e009d31dc33199a6bb4726638a /compat | |
| parent | 976c16da975f25352f5740a5c6e045a5235422b0 (diff) | |
move all PAM_AUTHTOK_RECOVERY_ERR compatibility definitions to compat/pam_compat.h
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1677 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/pam_compat.h | 7 | ||||
| -rw-r--r-- | compat/pam_get_authtok.c | 9 |
2 files changed, 4 insertions, 12 deletions
diff --git a/compat/pam_compat.h b/compat/pam_compat.h index b4923f6..4109b77 100644 --- a/compat/pam_compat.h +++ b/compat/pam_compat.h @@ -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 */ diff --git a/compat/pam_get_authtok.c b/compat/pam_get_authtok.c index a2f3b9a..17b97ad 100644 --- a/compat/pam_get_authtok.c +++ b/compat/pam_get_authtok.c @@ -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; |