diff options
| author | Greg Hudson <ghudson@mit.edu> | 2020-07-11 21:47:08 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2020-09-07 12:20:16 -0400 |
| commit | 91596ae028cf458b61c03c13dee8c0b7039b8d76 (patch) | |
| tree | 8b613fea3583702af642b3384c036a2f879355f3 /src/include | |
| parent | 10eb93809b1af06e2b1147aee2e3e50058ba1bbd (diff) | |
| download | krb5-91596ae028cf458b61c03c13dee8c0b7039b8d76.zip krb5-91596ae028cf458b61c03c13dee8c0b7039b8d76.tar.gz krb5-91596ae028cf458b61c03c13dee8c0b7039b8d76.tar.bz2 | |
Rename master_kdc and iprop_master_ulogsize
Use "primary_kdc" and "iprop_ulogsize" as the preferred names of the
two relations. Fall back to the old keys if the new ones are not set.
ticket: 8921
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-int.h | 2 | ||||
| -rw-r--r-- | src/include/krb5/locate_plugin.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index f50cee7..b3e3469 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -228,6 +228,7 @@ typedef unsigned char u_char; #define KRB5_CONF_IPROP_RESYNC_TIMEOUT "iprop_resync_timeout" #define KRB5_CONF_IPROP_REPLICA_POLL "iprop_replica_poll" #define KRB5_CONF_IPROP_SLAVE_POLL "iprop_slave_poll" +#define KRB5_CONF_IPROP_ULOGSIZE "iprop_ulogsize" #define KRB5_CONF_K5LOGIN_AUTHORITATIVE "k5login_authoritative" #define KRB5_CONF_K5LOGIN_DIRECTORY "k5login_directory" #define KRB5_CONF_KADMIND_LISTEN "kadmind_listen" @@ -280,6 +281,7 @@ typedef unsigned char u_char; #define KRB5_CONF_PLUGINS "plugins" #define KRB5_CONF_PLUGIN_BASE_DIR "plugin_base_dir" #define KRB5_CONF_PREFERRED_PREAUTH_TYPES "preferred_preauth_types" +#define KRB5_CONF_PRIMARY_KDC "primary_kdc" #define KRB5_CONF_PROXIABLE "proxiable" #define KRB5_CONF_QUALIFY_SHORTNAME "qualify_shortname" #define KRB5_CONF_RDNS "rdns" diff --git a/src/include/krb5/locate_plugin.h b/src/include/krb5/locate_plugin.h index d0e8549..7a872a1 100644 --- a/src/include/krb5/locate_plugin.h +++ b/src/include/krb5/locate_plugin.h @@ -34,11 +34,12 @@ enum locate_service_type { locate_service_kdc = 1, - locate_service_master_kdc, + locate_service_primary_kdc, locate_service_kadmin, locate_service_krb524, locate_service_kpasswd }; +#define locate_service_master_kdc locate_service_primary_kdc typedef struct krb5plugin_service_locate_ftable { int minor_version; /* currently 0 */ |