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/plugins/preauth | |
| parent | 1c4f3aa73062270b7a52000aead421c32729c612 (diff) | |
| download | krb5-505dc481d11ca0be3f4f99275c28cd3f5a3eed57.tar.gz krb5-505dc481d11ca0be3f4f99275c28cd3f5a3eed57.tar.xz krb5-505dc481d11ca0be3f4f99275c28cd3f5a3eed57.zip | |
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/plugins/preauth')
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_identity.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/preauth/pkinit/pkinit_identity.c b/src/plugins/preauth/pkinit/pkinit_identity.c index 4e9f61ef5..fc4d08d71 100644 --- a/src/plugins/preauth/pkinit/pkinit_identity.c +++ b/src/plugins/preauth/pkinit/pkinit_identity.c @@ -261,7 +261,7 @@ parse_pkcs11_options(krb5_context context, pkinit_identity_opts *idopts, const char *residual) { - char *s, *cp, *vp; + char *s, *cp, *vp, *save; krb5_error_code retval = ENOMEM; if (residual == NULL || residual[0] == '\0') @@ -272,7 +272,7 @@ parse_pkcs11_options(krb5_context context, if (s == NULL) return retval; - for ((cp = strtok(s, ":")); cp; (cp = strtok(NULL, ":"))) { + for (cp = strtok_r(s, ":", &save); cp; cp = strtok_r(NULL, ":", &save)) { vp = strchr(cp, '='); /* If there is no "=", this is a pkcs11 module name */ @@ -334,7 +334,7 @@ parse_fs_options(krb5_context context, pkinit_identity_opts *idopts, const char *residual) { - char *certname, *keyname; + char *certname, *keyname, *save; krb5_error_code retval = ENOMEM; if (residual == NULL || residual[0] == '\0') @@ -344,8 +344,8 @@ parse_fs_options(krb5_context context, if (certname == NULL) goto cleanup; - certname = strtok(certname, ","); - keyname = strtok(NULL, ","); + certname = strtok_r(certname, ",", &save); + keyname = strtok_r(NULL, ",", &save); idopts->cert_filename = strdup(certname); if (idopts->cert_filename == NULL) |