diff options
| author | Volker Lendecke <vl@samba.org> | 2008-01-23 11:04:10 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-01-23 15:08:04 +0100 |
| commit | 587cf54c61c9f1f7bcae431a82035fd942716c32 (patch) | |
| tree | c11ebe9ab6ed860e7e768b1b7de4db3c8ac609a1 /source3/smbd/password.c | |
| parent | 20512431321388cf293431b942cbbe9263d295c9 (diff) | |
| download | samba-587cf54c61c9f1f7bcae431a82035fd942716c32.tar.gz samba-587cf54c61c9f1f7bcae431a82035fd942716c32.tar.bz2 samba-587cf54c61c9f1f7bcae431a82035fd942716c32.zip | |
strtok -> strtok_r
(This used to be commit fd34ce437057bb34cdc37f4b066e424000d36789)
Diffstat (limited to 'source3/smbd/password.c')
| -rw-r--r-- | source3/smbd/password.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c index 6b517c3d86..85e1ccf0a7 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -759,6 +759,7 @@ bool authorise_login(int snum, fstring user, DATA_BLOB password, if (!ok) { char *auser; char *user_list = NULL; + char *saveptr; if ( session_userlist ) user_list = SMB_STRDUP(session_userlist); @@ -768,8 +769,9 @@ bool authorise_login(int snum, fstring user, DATA_BLOB password, if (!user_list) return(False); - for (auser=strtok(user_list,LIST_SEP); !ok && auser; - auser = strtok(NULL,LIST_SEP)) { + for (auser = strtok_r(user_list, LIST_SEP, &saveptr); + !ok && auser; + auser = strtok_r(NULL, LIST_SEP, &saveptr)) { fstring user2; fstrcpy(user2,auser); if (!user_ok(user2,snum)) @@ -792,6 +794,7 @@ bool authorise_login(int snum, fstring user, DATA_BLOB password, TALLOC_CTX *ctx = talloc_tos(); char *auser; char *user_list = talloc_strdup(ctx, lp_username(snum)); + char *saveptr; if (!user_list) { goto check_guest; @@ -806,8 +809,9 @@ bool authorise_login(int snum, fstring user, DATA_BLOB password, goto check_guest; } - for (auser=strtok(user_list,LIST_SEP); auser && !ok; - auser = strtok(NULL,LIST_SEP)) { + for (auser = strtok_r(user_list, LIST_SEP, &saveptr); + auser && !ok; + auser = strtok_r(NULL, LIST_SEP, &saveptr)) { if (*auser == '@') { auser = validate_group(auser+1,password,snum); if (auser) { |