Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5

[openldap] / servers / slapd / back-ldap / bind.c

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 45f228a2824c2a6145b94dd583db241449d4a8da..1718e612d302c97195f7066349410cd3bf5151fd 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2013 The OpenLDAP Foundation.
+ * Copyright 1999-2014 The OpenLDAP Foundation.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -37,9 +37,7 @@
 
 #define LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ      "2.16.840.1.113730.3.4.12"
 
-#ifdef LDAP_DEVEL
 #define SLAP_AUTH_DN 1
-#endif
 
 #if LDAP_BACK_PRINT_CONNTREE > 0
 
@@ -717,7 +715,7 @@ ldap_back_prepare_conn( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_
        }
 
        /* turn on network keepalive, if configured so */
-       slap_client_keepalive(ld, &li->li_tls.sb_keepalive); 
+       slap_client_keepalive(ld, &li->li_tls.sb_keepalive);
 
 #ifdef HAVE_TLS
        if ( LDAP_BACK_CONN_ISPRIV( lc ) ) {