diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-09-29 03:19:27 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-09-29 03:19:27 +0000 |
| commit | 776389d695336a046cea6990411eac28f74f72e4 (patch) | |
| tree | cb595e8469c27e6cd2462afc35d326c2b1dda976 | |
| parent | 00a09b9d6a4a366b6e6dbd15e1e1e273bb0dc9c1 (diff) | |
| download | krb5-776389d695336a046cea6990411eac28f74f72e4.zip krb5-776389d695336a046cea6990411eac28f74f72e4.tar.gz krb5-776389d695336a046cea6990411eac28f74f72e4.tar.bz2 | |
Only convert instances which don't have a '.' in them. If they have a
'.', assume that they are fully qualified already.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6883 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/krb5/krb/conv_princ.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index b1a51a6..d9285e5 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 28 22:58:53 1995 Theodore Y. Ts'o <tytso@dcl> + + * conv_princ.c (krb5_425_conv_principal): Only convert instances + which don't have a '.' in them. If they have a '.', + assume that they are fully qualified already. + Thu Sep 28 12:00:00 1995 John Rivlin <jrivlin@fusion.com) * gc_via_tkt.c: Cleaned up corrupt ticket error testing to diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c index fb9072c..8084b0f 100644 --- a/src/lib/krb5/krb/conv_princ.c +++ b/src/lib/krb5/krb/conv_princ.c @@ -196,7 +196,7 @@ krb5_425_conv_principal(context, name, instance, realm, princ) p++; } name = p->v5_str; - if (p->flags & DO_REALM_CONVERSION) { + if ((p->flags & DO_REALM_CONVERSION) && !strchr(instance, '.')) { names[0] = "realms"; names[1] = realm; names[2] = "v4_instance_convert"; |