diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kadm5/alt_prof.c | 4 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/svr_policy.c | 2 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/svr_principal.c | 4 | ||||
| -rw-r--r-- | src/lib/kadm5/str_conv.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c index bd1b8c82a..09be1efda 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 1f794e41b..dfb31832e 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 7681636a7..bc66d5c74 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 00d61f560..83d081e78 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 */ |