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.)

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index ab82f644972f4b71e19b1bd9f1f5628a5833c1c9..1f644ef71752bf04fd493b23bf2236066218922b 100644 (file)
--- 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 5e9213fa4b4dea3759f793a2600328894eda262f..1bfb5d045730954bf0fd6912036444ba2a61d5e2 100644 (file)
--- 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 02e3b1862b6262d450659baf66003c6651317d6f..5252ab428c9ac8cef948250c9d6cd41c23fe216d 100644 (file)
--- 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,