svn rev #25092: trunk/src/ include/ plugins/kdb/ldap/ldap_util/ plugins/kdb/ldap/libkdb_ldap/
tsitkova@MIT.EDU
tsitkova at MIT.EDU
Wed Aug 10 13:10:37 EDT 2011
http://src.mit.edu/fisheye/changelog/krb5/?cs=25092
Commit By: tsitkova
Log Message:
Clean up some ldap #define's
Changed Files:
U trunk/src/include/k5-int.h
U trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
U trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
U trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c
U trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_krbcontainer.c
U trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
Modified: trunk/src/include/k5-int.h
===================================================================
--- trunk/src/include/k5-int.h 2011-08-09 21:09:30 UTC (rev 25091)
+++ trunk/src/include/k5-int.h 2011-08-10 17:10:37 UTC (rev 25092)
@@ -238,12 +238,13 @@
#define KRB5_CONF_KEY_STASH_FILE "key_stash_file"
#define KRB5_CONF_KPASSWD_PORT "kpasswd_port"
#define KRB5_CONF_KPASSWD_SERVER "kpasswd_server"
+#define KRB5_CONF_LDAP_CONNS_PER_SERVER "ldap_conns_per_server"
+#define KRB5_CONF_LDAP_KADMIN_DN "ldap_kadmind_dn"
#define KRB5_CONF_LDAP_KDC_DN "ldap_kdc_dn"
-#define KRB5_CONF_LDAP_KADMIN_DN "ldap_kadmind_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_LDAP_ROOT_CERTIFICATE_FILE "ldap_root_certificate_file"
-#define KRB5_CONF_LDAP_SERVERS "ldap_servers"
-#define KRB5_CONF_LDAP_CONNS_PER_SERVER "ldap_conns_per_server"
#define KRB5_CONF_LIBDEFAULTS "libdefaults"
#define KRB5_CONF_LOGGING "logging"
#define KRB5_CONF_MASTER_KEY_NAME "master_key_name"
Modified: trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
===================================================================
--- trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c 2011-08-09 21:09:30 UTC (rev 25091)
+++ trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c 2011-08-10 17:10:37 UTC (rev 25092)
@@ -538,7 +538,7 @@
if (ldap_context->conf_section) {
if ((retval=profile_get_string(util_context->profile,
KDB_MODULE_SECTION, ldap_context->conf_section,
- "ldap_kerberos_container_dn", NULL,
+ KRB5_CONF_LDAP_KERBEROS_CONTAINER_DN, NULL,
&kparams.DN)) != 0) {
goto cleanup;
}
@@ -546,7 +546,7 @@
if (kparams.DN == NULL) {
if ((retval=profile_get_string(util_context->profile,
KDB_MODULE_DEF_SECTION,
- "ldap_kerberos_container_dn", NULL,
+ KRB5_CONF_LDAP_KERBEROS_CONTAINER_DN, NULL,
NULL, &kparams.DN)) != 0) {
goto cleanup;
}
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h 2011-08-09 21:09:30 UTC (rev 25091)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h 2011-08-10 17:10:37 UTC (rev 25092)
@@ -146,10 +146,6 @@
#define UNSTORE16_INT(ptr, val) (val = load_16_be(ptr))
#define UNSTORE32_INT(ptr, val) (val = load_32_be(ptr))
-#define KRB5_CONF_KDC_BIND_DN "ldap_kdc_dn"
-#define KRB5_CONF_ADMIN_BIND_DN "ldap_kadmind_dn"
-#define KRB5_CONF_PWD_BIND_DN "ldap_passwd_dn"
-
#define KDB_TL_USER_INFO 0x7ffe
#define KDB_TL_PRINCTYPE 0x01
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c 2011-08-09 21:09:30 UTC (rev 25091)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c 2011-08-10 17:10:37 UTC (rev 25092)
@@ -258,7 +258,7 @@
if (ldap_context->conf_section) {
if ((status = profile_get_string(context->profile,
KDB_MODULE_SECTION, ldap_context->conf_section,
- "ldap_kerberos_container_dn", NULL,
+ KRB5_CONF_LDAP_KERBEROS_CONTAINER_DN, NULL,
&kparams.DN)) != 0) {
goto cleanup;
}
@@ -266,7 +266,7 @@
if (kparams.DN == NULL) {
if ((status = profile_get_string(context->profile,
KDB_MODULE_DEF_SECTION,
- "ldap_kerberos_container_dn", NULL,
+ KRB5_CONF_LDAP_KERBEROS_CONTAINER_DN, NULL,
NULL, &kparams.DN)) != 0) {
goto cleanup;
}
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_krbcontainer.c
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_krbcontainer.c 2011-08-09 21:09:30 UTC (rev 25091)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_krbcontainer.c 2011-08-10 17:10:37 UTC (rev 25092)
@@ -91,7 +91,7 @@
/* read kerberos containter location from [dbmodules] section of krb5.conf file */
if (ldap_context->conf_section) {
if ((st=profile_get_string(context->profile, KDB_MODULE_SECTION, ldap_context->conf_section,
- "ldap_kerberos_container_dn", NULL,
+ KRB5_CONF_LDAP_KERBEROS_CONTAINER_DN, NULL,
&cparams->DN)) != 0) {
krb5_set_error_message(context, st,
_("Error reading kerberos container "
@@ -103,7 +103,7 @@
/* read kerberos containter location from [dbdefaults] section of krb5.conf file */
if (cparams->DN == NULL) {
if ((st=profile_get_string(context->profile, KDB_MODULE_DEF_SECTION,
- "ldap_kerberos_container_dn", NULL,
+ KRB5_CONF_LDAP_KERBEROS_CONTAINER_DN, NULL,
NULL, &cparams->DN)) != 0) {
krb5_set_error_message(context, st,
_("Error reading kerberos container "
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c 2011-08-09 21:09:30 UTC (rev 25091)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c 2011-08-10 17:10:37 UTC (rev 25092)
@@ -242,7 +242,7 @@
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 = "ldap_kpasswdd_dn";
+ name = KRB5_CONF_LDAP_KPASSWDD_DN;
if (name) {
st = prof_get_string_def (context, conf_section, name,
More information about the cvs-krb5
mailing list