From c53ea7bef444d7c151c46224b7a0600b9539496f Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 11 Jan 2013 13:26:37 -0500 Subject: Simplify KDC host referral code Remove some unnecessary optimizations to reduce code complexity. Get rid of krb5_match_config_pattern in favor of a simpler helper function in do_tgs_req_c. Get rid of KRB5_CONF_ASTERISK and just use "*" instead. Use a helper function to combine [kdcdefaults] and realm subsection values of variables, and don't bother adding leading and trailing spaces. Consistently use the names "hostbased" and "no_referral" to refer to variable values (with a "realm_" prefix for structures which currently use it). --- src/include/adm_proto.h | 1 - src/include/k5-int.h | 1 - 2 files changed, 2 deletions(-) (limited to 'src/include') diff --git a/src/include/adm_proto.h b/src/include/adm_proto.h index e9cbab6e8c..daca5a1162 100644 --- a/src/include/adm_proto.h +++ b/src/include/adm_proto.h @@ -79,7 +79,6 @@ krb5_error_code krb5_aprof_finish(krb5_pointer); krb5_error_code krb5_read_realm_params(krb5_context, char *, krb5_realm_params **); krb5_error_code krb5_free_realm_params(krb5_context, krb5_realm_params *); -krb5_boolean krb5_match_config_pattern(const char *, const char *); /* str_conv.c */ krb5_error_code krb5_string_to_flags(char *, const char *, const char *, diff --git a/src/include/k5-int.h b/src/include/k5-int.h index fef1ddbf94..9da1b63b66 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -275,7 +275,6 @@ typedef INT64_TYPE krb5_int64; #define KRB5_CONF_VERIFY_AP_REQ_NOFAIL "verify_ap_req_nofail" #define KRB5_CONF_V4_INSTANCE_CONVERT "v4_instance_convert" #define KRB5_CONF_V4_REALM "v4_realm" -#define KRB5_CONF_ASTERISK "*" /* Cache configuration variables */ #define KRB5_CC_CONF_FAST_AVAIL "fast_avail" -- cgit