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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index b1a51a6e4ab6cfe30c1bc501d2358d814fadfbd0..d9285e501bf8ce68e1714f671bada6bf57ce90a8 100644 (file)
--- 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 fb9072cfcb3408488f19b18dde8551b7cd5fec4d..8084b0f55de496f49bb79138c345cc85d8d48c2a 100644 (file)
--- 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";