krb5 commit [krb5-1.12]: Conditionalize use of LDAP_OPT_DEBUG_LEVEL

Tom Yu tlyu at MIT.EDU
Thu Jun 26 16:53:35 EDT 2014


https://github.com/krb5/krb5/commit/35516278f45a6509d54d88af2e02c81cd24caa47
commit 35516278f45a6509d54d88af2e02c81cd24caa47
Author: Greg Hudson <ghudson at mit.edu>
Date:   Fri Feb 28 10:17:29 2014 -0500

    Conditionalize use of LDAP_OPT_DEBUG_LEVEL
    
    The LDAP debug level option (#7551) causes a build failure with the
    Solaris LDAP library, which does not have LDAP_OPT_DEBUG_LEVEL.
    
    (cherry picked from commit 0364d0da094be0fbf3a9a08b79b6e23eaaf0d2d7)
    
    ticket: 7870
    version_fixed: 1.12.2
    status: resolved

 src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
index b2730d6..b9f70fd 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
@@ -154,7 +154,9 @@ krb5_ldap_db_init(krb5_context context, krb5_ldap_context *ldap_context)
     if ((st=krb5_validate_ldap_context(context, ldap_context)) != 0)
         return st;
 
+#ifdef LDAP_OPT_DEBUG_LEVEL
     ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &ldap_context->ldap_debug);
+#endif
     ldap_set_option(NULL, LDAP_OPT_PROTOCOL_VERSION, &version);
 #ifdef LDAP_OPT_NETWORK_TIMEOUT
     ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, &local_timelimit);


More information about the cvs-krb5 mailing list