diff options
| author | Greg Hudson <ghudson@mit.edu> | 2009-08-10 05:02:43 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2009-08-10 05:02:43 +0000 |
| commit | 505dc481d11ca0be3f4f99275c28cd3f5a3eed57 (patch) | |
| tree | aa97973217db0caa834faa2da722e83db70c9bb9 /src/lib/kadm5/srv | |
| parent | 1c4f3aa73062270b7a52000aead421c32729c612 (diff) | |
| download | krb5-505dc481d11ca0be3f4f99275c28cd3f5a3eed57.zip krb5-505dc481d11ca0be3f4f99275c28cd3f5a3eed57.tar.gz krb5-505dc481d11ca0be3f4f99275c28cd3f5a3eed57.tar.bz2 | |
Convert all uses of strtok() in libraries to strtok_r() for thread
safety.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22513 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kadm5/srv')
| -rw-r--r-- | src/lib/kadm5/srv/server_acl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c index fd245ba..45f3879 100644 --- a/src/lib/kadm5/srv/server_acl.c +++ b/src/lib/kadm5/srv/server_acl.c @@ -282,7 +282,7 @@ kadm5int_acl_parse_restrictions(s, rpp) char *s; restriction_t **rpp; { - char *sp = NULL, *tp, *ap; + char *sp = NULL, *tp, *ap, *save; static const char *delims = "\t\n\f\v\r ,"; krb5_deltat dt; krb5_flags flag; @@ -299,7 +299,8 @@ kadm5int_acl_parse_restrictions(s, rpp) code = ENOMEM; } else { memset(*rpp, 0, sizeof(**rpp)); - for (tp=strtok(sp, delims); tp; tp=strtok((char *)NULL, delims)) { + for (tp = strtok_r(sp, delims, &save); tp; + tp = strtok_r(NULL, delims, &save)) { flag = 0; if (!krb5_string_to_flags(tp, "+", "-", &flag)) { /* OK, but was it in the positive or negative sense? */ @@ -315,7 +316,7 @@ kadm5int_acl_parse_restrictions(s, rpp) (*rpp)->mask |= KADM5_POLICY_CLR; } else { /* everything else needs an argument ... */ - if (!(ap = strtok((char *)NULL, delims))) { + if (!(ap = strtok_r(NULL, delims, &save))) { code = EINVAL; break; } |