From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 21 Jul 2008 20:30:44 +0000 (+0000)
Subject: krb5_string_to_keysalts()
X-Git-Tag: krb5-1.7-alpha1~573
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebe25d9f759503d96a551afeaf3f1214336801de;p=krb5.git

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

ticket: 5839
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20557 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 */