From 76c27cf7e3161e0f20f8935d82ae0f2feb77b01a Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Sun, 18 Nov 2012 23:48:59 -0500 Subject: 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.) --- src/include/k5-int.h | 1 - src/include/kdb.h | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/include') 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 -- cgit