From: Tom Yu <tlyu@mit.edu>
Date: Mon, 21 Jul 2008 22:59:15 +0000 (+0000)
Subject: pull up r20557 from trunk
X-Git-Tag: kfw-3.2.3-alpha1~30
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d73db6d61a2f9a79740f5ba605494ef46fad9f1a;p=krb5.git

pull up r20557 from trunk

 r20557@cathode-dark-space:  jaltman | 2008-07-21 16:30:44 -0400
 ticket: 5839
 tags: pullup

 krb5_string_to_keysalts()
   Fix an infinite loop in the parsing of 'kp'



ticket: 5839
status: resolved
version_fixed: 1.6.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20563 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c
index 4a2a67873..0d142d6de 100644
--- a/src/lib/kadm5/str_conv.c
+++ b/src/lib/kadm5/str_conv.c
@@ -310,7 +310,7 @@ krb5_string_to_keysalts(string, tupleseps, ksaltseps, dups, ksaltp, nksaltp)
 	septmp = ksseplist;
 	for (sp = strchr(kp, (int) *septmp);
 	     *(++septmp) && !sp;
-	     ep = strchr(kp, (int) *septmp));
+	     sp = strchr(kp, (int) *septmp));
 
 	if (sp) {
 	    /* Separate enctype from salttype */