From: Theodore Tso <tytso@mit.edu>
Date: Fri, 29 Sep 1995 03:19:27 +0000 (+0000)
Subject: Only convert instances which don't have a '.' in them.  If they have a
X-Git-Tag: krb5-1.0-beta6~983
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=776389d695336a046cea6990411eac28f74f72e4;p=krb5.git

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 b1a51a6e4..d9285e501 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 fb9072cfc..8084b0f55 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";