From cc26d29b8087e31d0ea1aca6bde45f8935e8b744 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 6 Jan 2014 17:17:02 -0500 Subject: 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 --- src/lib/kadm5/alt_prof.c | 4 ++-- src/lib/kadm5/srv/svr_policy.c | 2 +- src/lib/kadm5/srv/svr_principal.c | 4 ++-- src/lib/kadm5/str_conv.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib') diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c index bd1b8c82a6..09be1efdad 100644 --- a/src/lib/kadm5/alt_prof.c +++ b/src/lib/kadm5/alt_prof.c @@ -727,8 +727,8 @@ krb5_error_code kadm5_get_config_params(krb5_context context, params.keysalts = NULL; params.num_keysalts = 0; krb5_string_to_keysalts(svalue, - ", \t", /* Tuple separators */ - ":.-", /* Key/salt separators */ + NULL, /* Tuple separators */ + NULL, /* Key/salt separators */ 0, /* No duplicates */ ¶ms.keysalts, ¶ms.num_keysalts); diff --git a/src/lib/kadm5/srv/svr_policy.c b/src/lib/kadm5/srv/svr_policy.c index 1f794e41b1..dfb31832ee 100644 --- a/src/lib/kadm5/srv/svr_policy.c +++ b/src/lib/kadm5/srv/svr_policy.c @@ -27,7 +27,7 @@ validate_allowed_keysalts(const char *allowed_keysalts) if (strchr(allowed_keysalts, '\t') != NULL) return KADM5_BAD_KEYSALTS; - ret = krb5_string_to_keysalts(allowed_keysalts, ",", ":.-", 0, + ret = krb5_string_to_keysalts(allowed_keysalts, ",", NULL, 0, &ks_tuple, &n_ks_tuple); free(ks_tuple); if (ret == EINVAL) diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 7681636a73..bc66d5c74e 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -256,8 +256,8 @@ apply_keysalt_policy(kadm5_server_handle_t handle, const char *policy, } ret = krb5_string_to_keysalts(polent.allowed_keysalts, - ", ", /* Tuple separators */ - ":.-", /* Key/salt separators */ + ",", /* Tuple separators */ + NULL, /* Key/salt separators */ 0, /* No duplicates */ &ak_ks_tuple, &ak_n_ks_tuple); diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c index 00d61f5603..83d081e78b 100644 --- a/src/lib/kadm5/str_conv.c +++ b/src/lib/kadm5/str_conv.c @@ -57,7 +57,7 @@ struct flags_lookup_entry { */ static const char default_tupleseps[] = ", \t"; -static const char default_ksaltseps[] = ":."; +static const char default_ksaltseps[] = ":"; /* Keytype strings */ /* Flags strings */ -- cgit