summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-05-01 01:26:15 +0000
committerJeremy Allison <jra@samba.org>2001-05-01 01:26:15 +0000
commita290cd597db9e94b603b5e94c3ac87cb9e068da0 (patch)
tree494abdd100a99c8f01f1b17d1b42fe5f921d0d9f
parent8bd2a11c86ddc3bbb2bec32415e027d87df639af (diff)
downloadsamba-a290cd597db9e94b603b5e94c3ac87cb9e068da0.tar.gz
samba-a290cd597db9e94b603b5e94c3ac87cb9e068da0.tar.xz
samba-a290cd597db9e94b603b5e94c3ac87cb9e068da0.zip
Allow pam code to compile on Solaris (which doesn't have PAM_AUTHTOK_RECOVER_ERR).
Jeremy. (This used to be commit 6b2dd14205a4170c11067c4f851db11ab9154fce)
-rw-r--r--source3/auth/pampass.c5
-rw-r--r--source3/passdb/pampass.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index 01d2d81b9d..09b84db71a 100644
--- a/source3/auth/pampass.c
+++ b/source3/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/source3/passdb/pampass.c b/source3/passdb/pampass.c
index 01d2d81b9d..09b84db71a 100644
--- a/source3/passdb/pampass.c
+++ b/source3/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;