diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-01-13 10:54:37 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-01-15 15:05:23 -0500 |
| commit | e987546b4ff1689bb711cc46118ad9fc0a5613f6 (patch) | |
| tree | 4c2a2d919733b173f970e3fcc5e3995d6c9d0530 /src/kdc/kdc_util.c | |
| parent | 744d6c334fa8448c604c3948a10b88098a6dcf51 (diff) | |
| download | krb5-e987546b4ff1689bb711cc46118ad9fc0a5613f6.tar.gz krb5-e987546b4ff1689bb711cc46118ad9fc0a5613f6.tar.xz krb5-e987546b4ff1689bb711cc46118ad9fc0a5613f6.zip | |
Remove KDC macros for realm config fields
Stop using macros to refer to kdc_realm_t fields, as they could
conflict with structure field names for the same. Leave behind the
kdc_context and tgs_server macros for now.
Diffstat (limited to 'src/kdc/kdc_util.c')
| -rw-r--r-- | src/kdc/kdc_util.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c index 6722d5a8b..930aa7a5e 100644 --- a/src/kdc/kdc_util.c +++ b/src/kdc/kdc_util.c @@ -568,7 +568,7 @@ check_anon(kdc_realm_t *kdc_active_realm, { /* If restrict_anon is set, reject requests from anonymous to principals * other than the local TGT. */ - if (restrict_anon && + if (kdc_active_realm->realm_restrict_anon && krb5_principal_compare_any_realm(kdc_context, client, krb5_anonymous_principal()) && !krb5_principal_compare(kdc_context, server, tgs_server)) @@ -909,7 +909,8 @@ dbentry_supports_enctype(kdc_realm_t *kdc_active_realm, krb5_db_entry *server, /* If configured to, assume every server without a session_enctypes * attribute supports DES_CBC_CRC. */ - if (assume_des_crc_sess && enctype == ENCTYPE_DES_CBC_CRC) + if (kdc_active_realm->realm_assume_des_crc_sess && + enctype == ENCTYPE_DES_CBC_CRC) return TRUE; /* Due to an ancient interop problem, assume nothing supports des-cbc-md5 @@ -1884,8 +1885,8 @@ kdc_get_ticket_endtime(kdc_realm_t *kdc_active_realm, life = min(life, client->max_life); if (server->max_life != 0) life = min(life, server->max_life); - if (max_life_for_realm != 0) - life = min(life, max_life_for_realm); + if (kdc_active_realm->realm_maxlife != 0) + life = min(life, kdc_active_realm->realm_maxlife); *out_endtime = starttime + life; } |