summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2001-04-13 04:27:50 +0000
committerJohn Terpstra <jht@samba.org>2001-04-13 04:27:50 +0000
commitabd4296ebf83d15d0a44a7173e4a0b4d711e17d8 (patch)
treef976555f75f7a4a3579e508a616a230c516a4463
parent90adf620ee48b407854714d3528f50366c26be5a (diff)
downloadsamba-abd4296ebf83d15d0a44a7173e4a0b4d711e17d8.tar.gz
samba-abd4296ebf83d15d0a44a7173e4a0b4d711e17d8.tar.bz2
samba-abd4296ebf83d15d0a44a7173e4a0b4d711e17d8.zip
Updated with Andrew Bartlett patch.
(This used to be commit 02e84267f74b26bdf7f76c0fc9dbaecbc8574d58)
-rw-r--r--source3/auth/pampass.c33
-rw-r--r--source3/passdb/pampass.c33
2 files changed, 60 insertions, 6 deletions
diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index 204deaf8c7..08f6027a88 100644
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -4,7 +4,7 @@
PAM Password checking
Copyright (C) Andrew Tridgell 1992-2001
Copyright (C) John H Terpsta 1999-2001
- Copyright (C) Andrew Barton 2001
+ Copyright (C) Andrew Bartlett 2001
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -224,8 +224,11 @@ static BOOL pam_auth(pam_handle_t *pamh, char *user, char *password)
case PAM_ABORT:
DEBUG(0, ("PAM: One or more PAM modules failed to load\n"));
break;
- default:
+ case PAM_SUCCESS:
DEBUG(4, ("PAM: User %s Authenticated OK\n", user));
+ break;
+ default:
+ DEBUG(0, ("PAM: UNKNOWN ERROR while authenticating user %s\n", user));
}
if(!pam_error_handler(pamh, pam_error, "Authentication Failure", 2)) {
proc_pam_end(pamh);
@@ -260,8 +263,11 @@ static BOOL pam_account(pam_handle_t *pamh, char * user, char * password)
case PAM_USER_UNKNOWN:
DEBUG(0, ("PAM: User \"%s\" is NOT known to account management\n", user));
break;
- default:
+ case PAM_SUCCESS:
DEBUG(4, ("PAM: Account OK for User: %s\n", user));
+ break;
+ default:
+ DEBUG(0, ("PAM: UNKNOWN ERROR for User: %s\n", user));
}
if(!pam_error_handler(pamh, pam_error, "Account Check Failed", 2)) {
proc_pam_end(pamh);
@@ -358,6 +364,27 @@ BOOL pam_session(BOOL flag, const connection_struct *conn, char *tty)
}
/*
+ * PAM Externally accessible Account handler
+ */
+BOOL pam_accountcheck(char * user)
+{
+ pam_handle_t *pamh = NULL;
+
+ PAM_username = user;
+ PAM_password = NULL;
+
+ if( proc_pam_start(&pamh, user))
+ {
+ if ( pam_account(pamh, user, NULL))
+ {
+ return( proc_pam_end(pamh));
+ }
+ }
+ DEBUG(0, ("PAM: Account Validation Failed - Rejecting User!\n"));
+ return( False );
+}
+
+/*
* PAM Password Validation Suite
*/
BOOL pam_passcheck(char * user, char * password)
diff --git a/source3/passdb/pampass.c b/source3/passdb/pampass.c
index 204deaf8c7..08f6027a88 100644
--- a/source3/passdb/pampass.c
+++ b/source3/passdb/pampass.c
@@ -4,7 +4,7 @@
PAM Password checking
Copyright (C) Andrew Tridgell 1992-2001
Copyright (C) John H Terpsta 1999-2001
- Copyright (C) Andrew Barton 2001
+ Copyright (C) Andrew Bartlett 2001
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -224,8 +224,11 @@ static BOOL pam_auth(pam_handle_t *pamh, char *user, char *password)
case PAM_ABORT:
DEBUG(0, ("PAM: One or more PAM modules failed to load\n"));
break;
- default:
+ case PAM_SUCCESS:
DEBUG(4, ("PAM: User %s Authenticated OK\n", user));
+ break;
+ default:
+ DEBUG(0, ("PAM: UNKNOWN ERROR while authenticating user %s\n", user));
}
if(!pam_error_handler(pamh, pam_error, "Authentication Failure", 2)) {
proc_pam_end(pamh);
@@ -260,8 +263,11 @@ static BOOL pam_account(pam_handle_t *pamh, char * user, char * password)
case PAM_USER_UNKNOWN:
DEBUG(0, ("PAM: User \"%s\" is NOT known to account management\n", user));
break;
- default:
+ case PAM_SUCCESS:
DEBUG(4, ("PAM: Account OK for User: %s\n", user));
+ break;
+ default:
+ DEBUG(0, ("PAM: UNKNOWN ERROR for User: %s\n", user));
}
if(!pam_error_handler(pamh, pam_error, "Account Check Failed", 2)) {
proc_pam_end(pamh);
@@ -358,6 +364,27 @@ BOOL pam_session(BOOL flag, const connection_struct *conn, char *tty)
}
/*
+ * PAM Externally accessible Account handler
+ */
+BOOL pam_accountcheck(char * user)
+{
+ pam_handle_t *pamh = NULL;
+
+ PAM_username = user;
+ PAM_password = NULL;
+
+ if( proc_pam_start(&pamh, user))
+ {
+ if ( pam_account(pamh, user, NULL))
+ {
+ return( proc_pam_end(pamh));
+ }
+ }
+ DEBUG(0, ("PAM: Account Validation Failed - Rejecting User!\n"));
+ return( False );
+}
+
+/*
* PAM Password Validation Suite
*/
BOOL pam_passcheck(char * user, char * password)