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 4a2a67873ed46281bfe525e04e0af190819107e9..0d142d6de4d4877d337dda2208258bf3f66021cc 100644 (file)
--- 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 */