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/kadmin.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/kadmin.c')
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index f5ca8adf30..733e784c92 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -337,7 +337,7 @@ kadmin_startup(int argc, char *argv[]) params.mask |= KADM5_CONFIG_MKEY_FROM_KBD; break; case 'e': - retval = krb5_string_to_keysalts(optarg, ", \t", ":.-", 0, + retval = krb5_string_to_keysalts(optarg, NULL, NULL, 0, ¶ms.keysalts, ¶ms.num_keysalts); if (retval) { @@ -788,7 +788,7 @@ kadmin_cpw(int argc, char *argv[]) cpw_usage(_("change_password: missing keysaltlist arg")); goto cleanup; } - 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("change_password", retval, @@ -1068,7 +1068,7 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc, if (!strcmp("-e", argv[i])) { if (++i > argc - 2) return -1; - retval = krb5_string_to_keysalts(argv[i], ", \t", ":.-", 0, + retval = krb5_string_to_keysalts(argv[i], NULL, NULL, 0, ks_tuple, n_ks_tuple); if (retval) { com_err(caller, retval, _("while parsing keysalts %s"), @@ -1616,7 +1616,7 @@ kadmin_parse_policy_args(int argc, char *argv[], kadm5_policy_ent_t policy, if (++i > argc - 2) return -1; if (strcmp(argv[i], "-")) { - retval = krb5_string_to_keysalts(argv[i], ",", ":.-", 0, + retval = krb5_string_to_keysalts(argv[i], ",", NULL, 0, &ks_tuple, &n_ks_tuple); if (retval) { com_err(caller, retval, _("while parsing keysalts %s"), |