diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2020-02-18 11:44:00 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-02-18 11:44:00 +0100 |
| commit | c7a66c8ca510e12f43355ac7cc893834964235b7 (patch) | |
| tree | b7927411115e7f50ec3d678c6a15a01ec39e81df | |
| parent | f5adefa106e28c92dd73dbabac12bad667ef7b8f (diff) | |
| download | pam-c7a66c8ca510e12f43355ac7cc893834964235b7.tar.gz pam-c7a66c8ca510e12f43355ac7cc893834964235b7.tar.bz2 pam-c7a66c8ca510e12f43355ac7cc893834964235b7.zip | |
Fix warnings from the recent PR merges
* modules/pam_succeed_if/pam_succeed_if.c: Fix const issues.
* modules/pam_usertype/pam_usertype.c: Avoid maybe used uninitialized warning.
| -rw-r--r-- | modules/pam_succeed_if/pam_succeed_if.c | 26 | ||||
| -rw-r--r-- | modules/pam_usertype/pam_usertype.c | 2 |
2 files changed, 21 insertions, 7 deletions
diff --git a/modules/pam_succeed_if/pam_succeed_if.c b/modules/pam_succeed_if/pam_succeed_if.c index b02b93d2..f33e6097 100644 --- a/modules/pam_succeed_if/pam_succeed_if.c +++ b/modules/pam_succeed_if/pam_succeed_if.c @@ -215,34 +215,48 @@ evaluate_notinlist(const char *left, const char *right) } /* Return PAM_SUCCESS if the user is in the group. */ static int -evaluate_ingroup(pam_handle_t *pamh, const char *user, const char *group) +evaluate_ingroup(pam_handle_t *pamh, const char *user, const char *grouplist) { char *ptr = NULL; - const char const *delim = ":"; + static const char delim[] = ":"; char const *grp = NULL; + char *group = strdup(grouplist); + + if (group == NULL) + return PAM_BUF_ERR; grp = strtok_r(group, delim, &ptr); while(grp != NULL) { - if (pam_modutil_user_in_group_nam_nam(pamh, user, grp) == 1) + if (pam_modutil_user_in_group_nam_nam(pamh, user, grp) == 1) { + free(group); return PAM_SUCCESS; + } grp = strtok_r(NULL, delim, &ptr); } + free(group); return PAM_AUTH_ERR; } /* Return PAM_SUCCESS if the user is NOT in the group. */ static int -evaluate_notingroup(pam_handle_t *pamh, const char *user, const char *group) +evaluate_notingroup(pam_handle_t *pamh, const char *user, const char *grouplist) { char *ptr = NULL; - const char const *delim = ":"; + static const char delim[] = ":"; char const *grp = NULL; + char *group = strdup(grouplist); + + if (group == NULL) + return PAM_BUF_ERR; grp = strtok_r(group, delim, &ptr); while(grp != NULL) { - if (pam_modutil_user_in_group_nam_nam(pamh, user, grp) == 1) + if (pam_modutil_user_in_group_nam_nam(pamh, user, grp) == 1) { + free(group); return PAM_AUTH_ERR; + } grp = strtok_r(NULL, delim, &ptr); } + free(group); return PAM_SUCCESS; } diff --git a/modules/pam_usertype/pam_usertype.c b/modules/pam_usertype/pam_usertype.c index d3629c13..a15599e3 100644 --- a/modules/pam_usertype/pam_usertype.c +++ b/modules/pam_usertype/pam_usertype.c @@ -271,7 +271,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { struct pam_usertype_opts opts; - uid_t uid; + uid_t uid = -1; int ret; ret = pam_usertype_parse_args(&opts, pamh, argc, argv); |