]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Default to normal salt instead of "ignore"
authorTom Yu <tlyu@mit.edu>
Mon, 6 Jan 2014 21:32:50 +0000 (16:32 -0500)
committerTom Yu <tlyu@mit.edu>
Mon, 6 Jan 2014 21:56:49 +0000 (16:56 -0500)
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

src/lib/kadm5/str_conv.c

index a490f14c09fa55d94bdfb934046c56d1b01d922d..00d61f5603448313aa30c41ac0f558628936451a 100644 (file)
@@ -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