summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-01-11 13:26:37 -0500
committerGreg Hudson <ghudson@mit.edu>2013-01-11 13:36:20 -0500
commitc53ea7bef444d7c151c46224b7a0600b9539496f (patch)
tree3656a64e4b36945f174d145e9f2cbac84ca11d44 /src/include
parent59ff1102942b564faa257c9f283efeb6fea63b8f (diff)
downloadkrb5-c53ea7bef444d7c151c46224b7a0600b9539496f.tar.gz
krb5-c53ea7bef444d7c151c46224b7a0600b9539496f.tar.xz
krb5-c53ea7bef444d7c151c46224b7a0600b9539496f.zip
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).
Diffstat (limited to 'src/include')
-rw-r--r--src/include/adm_proto.h1
-rw-r--r--src/include/k5-int.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/include/adm_proto.h b/src/include/adm_proto.h
index e9cbab6e8..daca5a116 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 fef1ddbf9..9da1b63b6 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"