diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-06-26 19:59:45 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-06-26 19:59:45 +0000 |
| commit | dbf38dc1a9a91a268720652ead79c9266f190131 (patch) | |
| tree | 9bf2ed8b5478885006031ee5d0d3013bbbcd49db /src/lib/kadm5/str_conv.c | |
| parent | 1fe6b5976dc1406122557126c960977717d3ddef (diff) | |
| download | krb5-dbf38dc1a9a91a268720652ead79c9266f190131.zip krb5-dbf38dc1a9a91a268720652ead79c9266f190131.tar.gz krb5-dbf38dc1a9a91a268720652ead79c9266f190131.tar.bz2 | |
* str_conv.c (krb5_string_to_keysalts): When parsing string, allow
for extra separator characters (like spaces) between keysalts.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13507 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kadm5/str_conv.c')
| -rw-r--r-- | src/lib/kadm5/str_conv.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c index 99334e8..4a2a678 100644 --- a/src/lib/kadm5/str_conv.c +++ b/src/lib/kadm5/str_conv.c @@ -363,7 +363,22 @@ krb5_string_to_keysalts(string, tupleseps, ksaltseps, dups, ksaltp, nksaltp) if (ep) ep[-1] = trailchar; kp = ep; - } + + /* Skip over extra separators - like spaces */ + if (kp && *tseplist) { + septmp = tseplist; + while(*septmp && *kp) { + if(*septmp == *kp) { + /* Increment string - reset separator list */ + kp++; + septmp = tseplist; + } else { + septmp++; + } + } + if (!*kp) kp = NULL; + } + } /* while kp */ return(kret); } |