diff options
| author | Tobias Stoeckmann <tobias@stoeckmann.org> | 2024-01-08 20:12:36 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2024-01-08 19:14:08 +0000 |
| commit | 92a85b74250bb146dcbd17966b88086047048620 (patch) | |
| tree | eea09f32d1b324d651bf3936fe13fd9257fe02ab /modules/pam_access | |
| parent | f19736ae30dfd68ac3f818c93e27a45655089a74 (diff) | |
| download | pam-92a85b74250bb146dcbd17966b88086047048620.tar.gz pam-92a85b74250bb146dcbd17966b88086047048620.tar.bz2 pam-92a85b74250bb146dcbd17966b88086047048620.zip | |
pam_access: avoid group name truncation
If a very long group name is supplied, do not truncate it. It is safe to
work directly on the supplied token, which is also already done in
user_match, from where group_match is also called.
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Diffstat (limited to 'modules/pam_access')
| -rw-r--r-- | modules/pam_access/pam_access.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c index 6091e2ff..1bb7a70b 100644 --- a/modules/pam_access/pam_access.c +++ b/modules/pam_access/pam_access.c @@ -254,7 +254,7 @@ typedef int match_func (pam_handle_t *, char *, struct login_info *); static int list_match (pam_handle_t *, char *, char *, struct login_info *, match_func *); static int user_match (pam_handle_t *, char *, struct login_info *); -static int group_match (pam_handle_t *, const char *, const char *, int); +static int group_match (pam_handle_t *, char *, const char *, int); static int from_match (pam_handle_t *, char *, struct login_info *); static int remote_match (pam_handle_t *, char *, struct login_info *); static int string_match (pam_handle_t *, const char *, const char *, int); @@ -667,11 +667,8 @@ user_match (pam_handle_t *pamh, char *tok, struct login_info *item) /* group_match - match a username against token named group */ static int -group_match (pam_handle_t *pamh, const char *tok, const char* usr, - int debug) +group_match (pam_handle_t *pamh, char *tok, const char* usr, int debug) { - char grptok[BUFSIZ] = {}; - if (debug) pam_syslog (pamh, LOG_DEBUG, "group_match: grp=%s, user=%s", tok, usr); @@ -680,9 +677,10 @@ group_match (pam_handle_t *pamh, const char *tok, const char* usr, return NO; /* token is received under the format '(...)' */ - strncpy(grptok, tok + 1, strlen(tok) - 2); + tok++; + tok[strlen(tok) - 1] = '\0'; - if (pam_modutil_user_in_group_nam_nam(pamh, usr, grptok)) + if (pam_modutil_user_in_group_nam_nam(pamh, usr, tok)) return YES; return NO; |