diff options
| author | Tom Yu <tlyu@mit.edu> | 2014-01-06 17:17:02 -0500 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2014-01-06 17:17:02 -0500 |
| commit | cc26d29b8087e31d0ea1aca6bde45f8935e8b744 (patch) | |
| tree | 575e36ab6f354177ddcc2c6e14daabb93231555c /src/kadmin/cli/keytab.c | |
| parent | 25a3b1bd943199bcaa3a9d3a43f90f8ea05f1124 (diff) | |
| download | krb5-cc26d29b8087e31d0ea1aca6bde45f8935e8b744.tar.gz krb5-cc26d29b8087e31d0ea1aca6bde45f8935e8b744.tar.xz krb5-cc26d29b8087e31d0ea1aca6bde45f8935e8b744.zip | |
Make salt defaulting work for keysalts
Make krb5_string_to_keysalts() default to only ":" as a key:salt
separator character. Change most of its callers to pass NULL so they
get the default separators.
Adapted from a patch proposed by Jon Looney.
ticket: 884
Diffstat (limited to 'src/kadmin/cli/keytab.c')
| -rw-r--r-- | src/kadmin/cli/keytab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c index 6d7288feb9..cd52da58b2 100644 --- a/src/kadmin/cli/keytab.c +++ b/src/kadmin/cli/keytab.c @@ -158,7 +158,7 @@ kadmin_keytab_add(int argc, char **argv) add_usage(); return; } - retval = krb5_string_to_keysalts(*++argv, ", \t", ":.-", 0, + retval = krb5_string_to_keysalts(*++argv, NULL, NULL, 0, &ks_tuple, &n_ks_tuple); if (retval) { com_err("ktadd", retval, _("while parsing keysalts %s"), |