From: Tom Yu <tlyu@mit.edu>
Date: Mon, 6 Jan 2014 21:32:50 +0000 (-0500)
Subject: Default to normal salt instead of "ignore"
X-Git-Tag: krb5-1.13-alpha1~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25a3b1bd943199bcaa3a9d3a43f90f8ea05f1124;p=thirdparty%2Fkrb5.git

Default to normal salt instead of "ignore"

krb5_string_to_keysalts() treats an empty salt field as -1 ("ignore"),
rather than as the normal salttype.  Default to normal instead, so
that omitting a salttype works as expected.

ticket: 6042
---

diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c
index a490f14c09..00d61f5603 100644
--- a/src/lib/kadm5/str_conv.c
+++ b/src/lib/kadm5/str_conv.c
@@ -308,7 +308,7 @@ krb5_string_to_keysalts(const char *string, const char *tupleseps,
             sp++;
         }
         else
-            stype = -1;
+            stype = KRB5_KDB_SALTTYPE_NORMAL;
 
         /*
          * Attempt to parse enctype and salttype.  If we parse well