From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 19 Nov 2012 04:48:59 +0000 (-0500)
Subject: Get rid of KRB5_KDB_SRV_TYPE_PASSWD
X-Git-Tag: krb5-1.12-alpha1~388
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76c27cf7e3161e0f20f8935d82ae0f2feb77b01a;p=thirdparty%2Fkrb5.git

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 ab82f64497..1f644ef717 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 5e9213fa4b..1bfb5d0457 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 02e3b1862b..5252ab428c 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,