diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-08-05 15:57:29 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-08-15 12:39:57 -0400 |
| commit | db21244a069e581a392dff5b320e758e06a28e4d (patch) | |
| tree | 7a99f0700c983da998571a7ab4bf845020a304be /src/include | |
| parent | d61fbd85467c71c9bfb185e0e675e1619972bd0b (diff) | |
| download | krb5-db21244a069e581a392dff5b320e758e06a28e4d.tar.gz krb5-db21244a069e581a392dff5b320e758e06a28e4d.tar.xz krb5-db21244a069e581a392dff5b320e758e06a28e4d.zip | |
Use hostrealm interface for realm mapping
Reimplement krb5_get_host_realm, krb5_get_fallback_host_realm, and
krb5_get_default_realm in terms of the hostrealm interface. Three
built-in modules (dns, domain, and profile) implement the current
behavior.
ticket: 7687
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-int.h | 4 | ||||
| -rw-r--r-- | src/include/k5-trace.h | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index a9a3c3c0e..ab97f40bb 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -1117,6 +1117,7 @@ struct _kdb_log_context; typedef struct krb5_preauth_context_st krb5_preauth_context; struct ccselect_module_handle; struct localauth_module_handle; +struct hostrealm_module_handle; struct _krb5_context { krb5_magic magic; krb5_enctype *in_tkt_etypes; @@ -1163,6 +1164,9 @@ struct _krb5_context { /* localauth module stuff */ struct localauth_module_handle **localauth_handles; + /* hostrealm module stuff */ + struct hostrealm_module_handle **hostrealm_handles; + /* error detail info */ struct errinfo err; diff --git a/src/include/k5-trace.h b/src/include/k5-trace.h index ac09eb05e..68672fd5b 100644 --- a/src/include/k5-trace.h +++ b/src/include/k5-trace.h @@ -183,6 +183,11 @@ void krb5int_trace(krb5_context context, const char *fmt, ...); #define TRACE_ENCTYPE_LIST_UNKNOWN(c, profvar, name) \ TRACE(c, "Unrecognized enctype name in {str}: {str}", profvar, name) +#define TRACE_HOSTREALM_VTINIT_FAIL(c, ret) \ + TRACE(c, "hostrealm module failed to init vtable: {kerr}", ret) +#define TRACE_HOSTREALM_INIT_FAIL(c, name, ret) \ + TRACE(c, "hostrealm module {str} failed to init: {kerr}", name, ret) + #define TRACE_INIT_CREDS(c, princ) \ TRACE(c, "Getting initial credentials for {princ}", princ) #define TRACE_INIT_CREDS_AS_KEY_GAK(c, keyblock) \ @@ -402,12 +407,6 @@ void krb5int_trace(krb5_context context, const char *fmt, ...); #define TRACE_TXT_LOOKUP_SUCCESS(c, host, realm) \ TRACE(c, "TXT record {str} found: {str}", host, realm) -#define TRACE_GET_HOST_REALM_RETURN(c, host, realm) \ - TRACE(c, "Got realm {str} for host {str}", realm, host) - -#define TRACE_GET_FALLBACK_HOST_REALM_RETURN(c, host, realm) \ - TRACE(c, "Got fallback realm {str} for host {str}", realm, host) - #define TRACE_SNAME_TO_PRINCIPAL(c, host, sname, type) \ TRACE(c, "Convert service {str} ({ptype}) on host {str} to principal", \ sname, type, host) |