Return the Start TLS error.

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index c2efec4bae5b3c251290a0cca5cb29db448f218a..7e4d4de498bab95b312dd14508ea8b991752f54a 100644 (file)
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -847,8 +847,7 @@ do_bind(
        ldap_set_option(ri->ri_ldp, LDAP_OPT_RESTART, LDAP_OPT_ON);
 
        if( ri->ri_tls ) {
-               int err;
-               err = ldap_start_tls_s(ri->ri_ldp, NULL, NULL);
+               int err = ldap_start_tls_s(ri->ri_ldp, NULL, NULL);
 
                if( err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
@@ -864,6 +863,7 @@ do_bind(
 #endif
 
                        if( ri->ri_tls == TLS_CRITICAL ) {
+                               *lderr = err;
                                ldap_unbind( ri->ri_ldp );
                                ri->ri_ldp = NULL;
                                return BIND_ERR_TLS_FAILED;
@@ -919,9 +919,8 @@ do_bind(
 
 #ifdef HAVE_CYRUS_SASL
        if( ri->ri_secprops != NULL ) {
-               int err;
-               err = ldap_set_option(ri->ri_ldp, LDAP_OPT_X_SASL_SECPROPS,
-                       ri->ri_secprops);
+               int err = ldap_set_option(ri->ri_ldp,
+                       LDAP_OPT_X_SASL_SECPROPS, ri->ri_secprops);
 
                if( err != LDAP_OPT_SUCCESS ) {
 #ifdef NEW_LOGGING