diff options
| author | Tomas Mraz <tm@t8m.info> | 2005-11-09 10:17:00 +0000 |
|---|---|---|
| committer | Tomas Mraz <tm@t8m.info> | 2005-11-09 10:17:00 +0000 |
| commit | 2d243af6b8ebe579f19ad27d3ab3907ebfe6a77e (patch) | |
| tree | e991eb0aabc5987b410af4bf85aa31a0a40c448f /modules/pam_access | |
| parent | 6c22ab1b705ee1e990ef3436ffbbbf18dc4c52d6 (diff) | |
| download | pam-2d243af6b8ebe579f19ad27d3ab3907ebfe6a77e.tar.gz pam-2d243af6b8ebe579f19ad27d3ab3907ebfe6a77e.tar.bz2 pam-2d243af6b8ebe579f19ad27d3ab3907ebfe6a77e.zip | |
Relevant BUGIDs: 562730, 435990
Purpose of commit: bugfix
Commit summary:
---------------
* modules/pam_access/pam_access.c (pam_sm_acct_mgmt): Parse correctly
full path tty name.
* modules/pam_time/pam_time.c (pam_sm_acct_mgmt): Parse correctly
full path tty name. Allow unset tty.
(logic_member): Allow matching ':' in tty name.
* modules/pam_group/pam_group.c (pam_sm_acct_mgmt): Parse correctly
full path tty name. Allow unset tty.
(logic_member): Allow matching ':' in tty name.
* libpam_misc/misc_conv.c (read_string): Read only up to EOL if stdin
is not terminal.
Diffstat (limited to 'modules/pam_access')
| -rw-r--r-- | modules/pam_access/pam_access.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c index 867cd9a1..2d8c92b4 100644 --- a/modules/pam_access/pam_access.c +++ b/modules/pam_access/pam_access.c @@ -435,11 +435,13 @@ pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED, else from = void_from; - if (from != NULL && from[0] == '/') { /* full path */ - from++; - from = strchr(from, '/'); - from++; - } + if (from[0] == '/') { /* full path */ + const char *f; + from++; + if ((f = strchr(from, '/')) != NULL) { + from = f + 1; + } + } } if ((user_pw=pam_modutil_getpwnam(pamh, user))==NULL) return (PAM_USER_UNKNOWN); |