diff options
| -rw-r--r-- | libpam/pam_misc.c | 2 | ||||
| -rw-r--r-- | libpam/pam_private.h | 2 | ||||
| -rw-r--r-- | tests/tst-pam_mkargv.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libpam/pam_misc.c b/libpam/pam_misc.c index aac0e923..996f23ce 100644 --- a/libpam/pam_misc.c +++ b/libpam/pam_misc.c @@ -163,7 +163,7 @@ char *_pam_memdup(const char *x, int len) /* Generate argv, argc from s */ /* caller must free(argv) */ -int _pam_mkargv(char *s, char ***argv, int *argc) +int _pam_mkargv(const char *s, char ***argv, int *argc) { int l; int argvlen = 0; diff --git a/libpam/pam_private.h b/libpam/pam_private.h index 8cb77528..ed02bb02 100644 --- a/libpam/pam_private.h +++ b/libpam/pam_private.h @@ -271,7 +271,7 @@ char *_pam_strdup(const char *s); char *_pam_memdup(const char *s, int len); -int _pam_mkargv(char *s, char ***argv, int *argc); +int _pam_mkargv(const char *s, char ***argv, int *argc); void _pam_sanitize(pam_handle_t *pamh); diff --git a/tests/tst-pam_mkargv.c b/tests/tst-pam_mkargv.c index d3e7a616..cb005e5f 100644 --- a/tests/tst-pam_mkargv.c +++ b/tests/tst-pam_mkargv.c @@ -18,16 +18,16 @@ /* Simple program to see if _pam_mkargv() would succeed. */ int main(void) { - char *argvstring = "user = XENDT\\userα user=XENDT\\user1"; - const char *argvresult[] = {"user", "=", "XENDT\\userα", - "user=XENDT\\user1"}; + static const char argvstring[] = "user = XENDT\\userα user=XENDT\\user1"; + static const char * const argvresult[] = {"user", "=", "XENDT\\userα", + "user=XENDT\\user1"}; int myargc; char **myargv; int argvlen; int explen; int i; - explen = (strlen(argvstring) + 1) * ((sizeof(char)) + sizeof(char *)); + explen = sizeof(argvstring) * ((sizeof(char)) + sizeof(char *)); argvlen = _pam_mkargv(argvstring, &myargv, &myargc); #if 0 |