Allow pam code to compile on Solaris (which doesn't have PAM_AUTHTOK_RECOVER_ERR).

Jeremy.

diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index 01d2d81b9de73fce64482f10e8940dfc3f367c34..09b84db71ac336f563739fe2202b20312e895d01 100644 (file)
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -525,9 +525,14 @@ static BOOL smb_pam_chauthtok(pam_handle_t *pamh, char * user)
        case PAM_AUTHTOK_ERR:
                DEBUG(2, ("PAM: unable to obtain the new authentication token - is password to weak?\n"));
                break;
+
+       /* This doesn't seem to be defined on Solaris. JRA */
+#ifdef PAM_AUTHTOK_RECOVER_ERR
        case PAM_AUTHTOK_RECOVER_ERR:
                DEBUG(2, ("PAM: unable to obtain the old authentication token - was the old password wrong?.\n"));
                break;
+#endif
+
        case PAM_AUTHTOK_LOCK_BUSY:
                DEBUG(2, ("PAM: unable to change the authentication token since it is currently locked.\n"));
                break;

diff --git a/source/passdb/pampass.c b/source/passdb/pampass.c
index 01d2d81b9de73fce64482f10e8940dfc3f367c34..09b84db71ac336f563739fe2202b20312e895d01 100644 (file)
--- a/source/passdb/pampass.c
+++ b/source/passdb/pampass.c
@@ -525,9 +525,14 @@ static BOOL smb_pam_chauthtok(pam_handle_t *pamh, char * user)
        case PAM_AUTHTOK_ERR:
                DEBUG(2, ("PAM: unable to obtain the new authentication token - is password to weak?\n"));
                break;
+
+       /* This doesn't seem to be defined on Solaris. JRA */
+#ifdef PAM_AUTHTOK_RECOVER_ERR
        case PAM_AUTHTOK_RECOVER_ERR:
                DEBUG(2, ("PAM: unable to obtain the old authentication token - was the old password wrong?.\n"));
                break;
+#endif
+
        case PAM_AUTHTOK_LOCK_BUSY:
                DEBUG(2, ("PAM: unable to change the authentication token since it is currently locked.\n"));
                break;