diff options
| author | Tom Yu <tlyu@mit.edu> | 2014-01-06 16:32:50 -0500 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2014-01-06 16:56:49 -0500 |
| commit | 25a3b1bd943199bcaa3a9d3a43f90f8ea05f1124 (patch) | |
| tree | ca98d4591b63ed5bb74660bf05b38b55cac1ece3 | |
| parent | c64e39c69a9a7ee32c00b0cf7918f6274a565544 (diff) | |
| download | krb5-25a3b1bd943199bcaa3a9d3a43f90f8ea05f1124.tar.gz krb5-25a3b1bd943199bcaa3a9d3a43f90f8ea05f1124.tar.xz krb5-25a3b1bd943199bcaa3a9d3a43f90f8ea05f1124.zip | |
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
| -rw-r--r-- | 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 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 |