[prev in list] [next in list] [prev in thread] [next in thread] 

List:       krb5-cvs
Subject:    krb5 commit: Conditionalize use of LDAP_OPT_DEBUG_LEVEL
From:       Greg Hudson <ghudson () mit ! edu>
Date:       2014-02-28 23:18:45
Message-ID: 201402282318.s1SNIj1o027556 () drugstore ! mit ! edu
[Download RAW message or body]

https://github.com/krb5/krb5/commit/0364d0da094be0fbf3a9a08b79b6e23eaaf0d2d7
commit 0364d0da094be0fbf3a9a08b79b6e23eaaf0d2d7
Author: Greg Hudson <ghudson@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.
    
    ticket: 7870 (new)
    target_version: 1.12.2
    tags: pullup

 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);
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5


[prev in list] [next in list] [prev in thread] [next in thread]