krb5 commit: Default to normal salt instead of "ignore"

Tom Yu tlyu at MIT.EDU
Mon Jan 6 17:48:02 EST 2014


https://github.com/krb5/krb5/commit/25a3b1bd943199bcaa3a9d3a43f90f8ea05f1124
commit 25a3b1bd943199bcaa3a9d3a43f90f8ea05f1124
Author: Tom Yu <tlyu at mit.edu>
Date:   Mon Jan 6 16:32:50 2014 -0500

    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

 src/lib/kadm5/str_conv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c
index a490f14..00d61f5 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


More information about the cvs-krb5 mailing list