diff options
| author | Thorsten Kukuk <kukuk@thkukuk.de> | 2004-09-24 09:18:21 +0000 |
|---|---|---|
| committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2004-09-24 09:18:21 +0000 |
| commit | 128ded83a0d1d3b5a85b4c20a6c35d9481e23ce5 (patch) | |
| tree | fdd298658b3808d85fe99fab062b911c9f2aeee6 /modules/pam_unix | |
| parent | c485b54636a6d93bdc9c9d82051db97d7dd53c71 (diff) | |
| download | pam-128ded83a0d1d3b5a85b4c20a6c35d9481e23ce5.tar.gz pam-128ded83a0d1d3b5a85b4c20a6c35d9481e23ce5.tar.bz2 pam-128ded83a0d1d3b5a85b4c20a6c35d9481e23ce5.zip | |
Relevant BUGIDs:
Purpose of commit:
Commit summary:
---------------
bugfix: Fix lot of compiler warnings
new feature: add broken_shadow option to pam_unix (patch from Linux
distributions)
Diffstat (limited to 'modules/pam_unix')
| -rw-r--r-- | modules/pam_unix/README | 2 | ||||
| -rw-r--r-- | modules/pam_unix/pam_unix_acct.c | 4 | ||||
| -rw-r--r-- | modules/pam_unix/support.h | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/modules/pam_unix/README b/modules/pam_unix/README index d6b1f395..afeee3da 100644 --- a/modules/pam_unix/README +++ b/modules/pam_unix/README @@ -31,5 +31,7 @@ The following options are recognized: nis - use NIS RPC for setting new password remember=X - remember X old passwords, they are kept in /etc/security/opasswd in MD5 crypted form + broken_shadow - ignore errors reading shadow information for + users in the account management module invalid arguments are logged to syslog. diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c index 178b6037..58ba93c1 100644 --- a/modules/pam_unix/pam_unix_acct.c +++ b/modules/pam_unix/pam_unix_acct.c @@ -129,6 +129,10 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t * pamh, int flags, } if (!spent) + if (on(UNIX_BROKEN_SHADOW,ctrl)) + return PAM_SUCCESS; + + if (!spent) return PAM_AUTHINFO_UNAVAIL; /* Couldn't get username from shadow */ curdays = time(NULL) / (60 * 60 * 24); diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h index 3127e6b0..d9212c28 100644 --- a/modules/pam_unix/support.h +++ b/modules/pam_unix/support.h @@ -81,8 +81,10 @@ typedef struct { #define UNIX_LIKE_AUTH 19 /* need to auth for setcred to work */ #define UNIX_REMEMBER_PASSWD 20 /* Remember N previous passwords */ #define UNIX_NOREAP 21 /* don't reap child process */ +#define UNIX_BROKEN_SHADOW 22 /* ignore errors reading password aging + * information during acct management */ /* -------------- */ -#define UNIX_CTRLS_ 22 /* number of ctrl arguments defined */ +#define UNIX_CTRLS_ 23 /* number of ctrl arguments defined */ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = @@ -112,6 +114,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = /* UNIX_LIKE_AUTH */ {"likeauth", _ALL_ON_, 01000000}, /* UNIX_REMEMBER_PASSWD */ {"remember=", _ALL_ON_, 02000000}, /* UNIX_NOREAP */ {"noreap", _ALL_ON_, 04000000}, +/* UNIX_BROKEN_SHADOW */ {"broken_shadow", _ALL_ON_, 010000000}, }; #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) |