diff options
| author | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 15:43:05 -0800 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 15:44:43 -0800 |
| commit | 9a4298687784e7812c8aeef6e0e97830febbf393 (patch) | |
| tree | 45942549c91c2ae3cb6b58aa5df40b9e121f908a /Linux-PAM/modules/pam_ftp/pam_ftp.c | |
| parent | d5b06b67bbeeed7c05c0eb2e05d6a972ad050d1c (diff) | |
| parent | 9bc383eeb9d9f5976645cb4c4850a8d36b2bd7da (diff) | |
| download | pam-9a4298687784e7812c8aeef6e0e97830febbf393.tar.gz pam-9a4298687784e7812c8aeef6e0e97830febbf393.tar.bz2 pam-9a4298687784e7812c8aeef6e0e97830febbf393.zip | |
New upstream version 0.99.8.1
Diffstat (limited to 'Linux-PAM/modules/pam_ftp/pam_ftp.c')
| -rw-r--r-- | Linux-PAM/modules/pam_ftp/pam_ftp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Linux-PAM/modules/pam_ftp/pam_ftp.c b/Linux-PAM/modules/pam_ftp/pam_ftp.c index 948dd729..9c69c108 100644 --- a/Linux-PAM/modules/pam_ftp/pam_ftp.c +++ b/Linux-PAM/modules/pam_ftp/pam_ftp.c @@ -79,10 +79,11 @@ static int lookup(const char *name, const char *list, const char **_user) if (list && *list) { const char *l; char *list_copy, *x; + char *sptr; list_copy = x_strdup(list); x = list_copy; - while (list_copy && (l = strtok(x, ","))) { + while (list_copy && (l = strtok_r(x, ",", &sptr))) { x = NULL; if (!strcmp(name, l)) { *_user = list; @@ -170,11 +171,12 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, /* XXX: Some effort should be made to verify this email address! */ if (!(ctrl & PAM_IGNORE_EMAIL)) { - token = strtok(resp, "@"); + char *sptr; + token = strtok_r(resp, "@", &sptr); retval = pam_set_item(pamh, PAM_RUSER, token); if ((token) && (retval == PAM_SUCCESS)) { - token = strtok(NULL, "@"); + token = strtok_r(NULL, "@", &sptr); retval = pam_set_item(pamh, PAM_RHOST, token); } } |