diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2020-01-20 13:28:59 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-01-20 13:28:59 +0100 |
| commit | c006f4c5a25c95fd4f39dcb87271825d0c154203 (patch) | |
| tree | d78658918facfb688314bf2a1ce4c10fb040504e /modules | |
| parent | a12ec8b879337c15acba04fe7f5c8e75f5a91809 (diff) | |
| download | pam-c006f4c5a25c95fd4f39dcb87271825d0c154203.tar.gz pam-c006f4c5a25c95fd4f39dcb87271825d0c154203.tar.bz2 pam-c006f4c5a25c95fd4f39dcb87271825d0c154203.zip | |
Fix miscellaneous const issues
* libpam/pam_modutil_searchkey.c: Avoid assigning empty string literal to
non-const char *.
* modules/pam_filter/pam_filter.c: Avoid using const char **.
* modules/pam_mkhomedir/pam_mkhomedir.c: Properly cast out const for execve().
* modules/pam_namespace/pam_namespace.c: Properly cast out const from pam data.
* modules/pam_tally2/pam_tally2.c: String literal must be assigned to
const char *.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/pam_filter/pam_filter.c | 5 | ||||
| -rw-r--r-- | modules/pam_mkhomedir/pam_mkhomedir.c | 2 | ||||
| -rw-r--r-- | modules/pam_namespace/pam_namespace.c | 6 | ||||
| -rw-r--r-- | modules/pam_tally2/pam_tally2.c | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/modules/pam_filter/pam_filter.c b/modules/pam_filter/pam_filter.c index b818bb8b..febb274f 100644 --- a/modules/pam_filter/pam_filter.c +++ b/modules/pam_filter/pam_filter.c @@ -253,7 +253,7 @@ static void free_evp(char *evp[]) static int set_filter (pam_handle_t *pamh, int flags UNUSED, int ctrl, - const char **evp, const char *filtername) + char * const evp[], const char *filtername) { int status=-1; char* terminal = NULL; @@ -632,8 +632,7 @@ static int need_a_filter(pam_handle_t *pamh } if (retval == PAM_SUCCESS && (ctrl & which_run)) { - retval = set_filter(pamh, flags, ctrl - , (const char **)evp, filterfile); + retval = set_filter(pamh, flags, ctrl, evp, filterfile); } if (retval == PAM_SUCCESS diff --git a/modules/pam_mkhomedir/pam_mkhomedir.c b/modules/pam_mkhomedir/pam_mkhomedir.c index 84c922f7..aec1e7e5 100644 --- a/modules/pam_mkhomedir/pam_mkhomedir.c +++ b/modules/pam_mkhomedir/pam_mkhomedir.c @@ -143,7 +143,7 @@ create_homedir (pam_handle_t *pamh, options_t *opt, args[2] = opt->umask; args[3] = opt->skeldir; - execve(MKHOMEDIR_HELPER, (char *const *) args, envp); + execve(MKHOMEDIR_HELPER, (char **)args, envp); /* should not get here: exit with error */ D(("helper binary is not available")); diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c index 6d2a125d..d49dc621 100644 --- a/modules/pam_namespace/pam_namespace.c +++ b/modules/pam_namespace/pam_namespace.c @@ -2177,7 +2177,7 @@ int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, { int i, retval; struct instance_data idata; - void *polyptr; + const void *polyptr; /* init instance data */ idata.flags = 0; @@ -2225,12 +2225,12 @@ int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, if (retval != PAM_SUCCESS) return retval; - retval = pam_get_data(idata.pamh, NAMESPACE_POLYDIR_DATA, (const void **)&polyptr); + retval = pam_get_data(idata.pamh, NAMESPACE_POLYDIR_DATA, &polyptr); if (retval != PAM_SUCCESS || polyptr == NULL) /* nothing to reset */ return PAM_SUCCESS; - idata.polydirs_ptr = polyptr; + idata.polydirs_ptr = (void *)polyptr; if (idata.flags & PAMNS_DEBUG) pam_syslog(idata.pamh, LOG_DEBUG, "Resetting namespace for pid %d", diff --git a/modules/pam_tally2/pam_tally2.c b/modules/pam_tally2/pam_tally2.c index ce7f5aee..48282a33 100644 --- a/modules/pam_tally2/pam_tally2.c +++ b/modules/pam_tally2/pam_tally2.c @@ -893,7 +893,7 @@ static void print_one(const struct tallylog *tally, uid_t uid) { static int once; - char *cp = "[UNKNOWN]"; + const char *cp = "[UNKNOWN]"; time_t fail_time; struct tm *tm; struct passwd *pwent; |