diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-11-18 23:48:59 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-12-20 11:35:42 -0500 |
| commit | 76c27cf7e3161e0f20f8935d82ae0f2feb77b01a (patch) | |
| tree | 8cf0cffea528af14595166ef154c2ef5a53f1798 /src | |
| parent | eb464c4ba8dcae82f6de1273cdadaddb9a052ae8 (diff) | |
| download | krb5-76c27cf7e3161e0f20f8935d82ae0f2feb77b01a.tar.gz krb5-76c27cf7e3161e0f20f8935d82ae0f2feb77b01a.tar.xz krb5-76c27cf7e3161e0f20f8935d82ae0f2feb77b01a.zip | |
Get rid of KRB5_KDB_SRV_TYPE_PASSWD
Nothing was using KRB5_KDB_SRV_TYPE_PASSWD, so get rid of it.
(kpasswdd is part of kadmind and interacts with the KDB using
KRB5_KDB_SRV_TYPE_ADMIN.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/k5-int.h | 1 | ||||
| -rw-r--r-- | src/include/kdb.h | 4 | ||||
| -rw-r--r-- | src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index ab82f6449..1f644ef71 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -244,7 +244,6 @@ typedef INT64_TYPE krb5_int64; #define KRB5_CONF_LDAP_KADMIN_DN "ldap_kadmind_dn" #define KRB5_CONF_LDAP_KDC_DN "ldap_kdc_dn" #define KRB5_CONF_LDAP_KERBEROS_CONTAINER_DN "ldap_kerberos_container_dn" -#define KRB5_CONF_LDAP_KPASSWDD_DN "ldap_kpasswdd_dn" #define KRB5_CONF_LDAP_SERVERS "ldap_servers" #define KRB5_CONF_LDAP_SERVICE_PASSWORD_FILE "ldap_service_password_file" #define KRB5_CONF_LIBDEFAULTS "libdefaults" diff --git a/src/include/kdb.h b/src/include/kdb.h index 5e9213fa4..1bfb5d045 100644 --- a/src/include/kdb.h +++ b/src/include/kdb.h @@ -335,9 +335,7 @@ extern char *krb5_mkey_pwd_prompt2; #define KRB5_KDB_SRV_TYPE_ADMIN 0x0200 #endif -#ifndef KRB5_KDB_SRV_TYPE_PASSWD -#define KRB5_KDB_SRV_TYPE_PASSWD 0x0300 -#endif +/* 0x0300 was KRB5_KDB_SRV_TYPE_PASSWD but it is no longer used. */ #ifndef KRB5_KDB_SRV_TYPE_OTHER #define KRB5_KDB_SRV_TYPE_OTHER 0x0400 diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c index 02e3b1862..5252ab428 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c +++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c @@ -241,8 +241,6 @@ krb5_ldap_read_server_params(krb5_context context, char *conf_section, name = KRB5_CONF_LDAP_KDC_DN; else if (srv_type == KRB5_KDB_SRV_TYPE_ADMIN) name = KRB5_CONF_LDAP_KADMIN_DN; - else if (srv_type == KRB5_KDB_SRV_TYPE_PASSWD) - name = KRB5_CONF_LDAP_KPASSWDD_DN; if (name) { st = prof_get_string_def (context, conf_section, name, |