More ldapbis cleanup

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

diff --git a/servers/slapd/back-ldap/extended.c b/servers/slapd/back-ldap/extended.c
index 21a4bd17f2ef148f532330071884316b8ebd5854..da178559b6c6e84528594714f2419ec7832f619a 100644 (file)
--- a/servers/slapd/back-ldap/extended.c
+++ b/servers/slapd/back-ldap/extended.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2005 The OpenLDAP Foundation.
+ * Copyright 2003-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,9 @@ static struct exop {
 static int
 ldap_back_extended_one( Operation *op, SlapReply *rs, BI_op_extended exop )
 {
-       ldapconn_t      *lc;
+       ldapinfo_t      *li = (ldapinfo_t *) op->o_bd->be_private;
+
+       ldapconn_t      *lc = NULL;
        LDAPControl     **oldctrls = NULL;
        int             rc;
 
@@ -50,13 +52,14 @@ ldap_back_extended_one( Operation *op, SlapReply *rs, BI_op_extended exop )
         * called twice; maybe we could avoid the 
         * ldap_back_dobind() call inside each extended()
         * call ... */
-       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
-       if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+       if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
                return -1;
        }
 
        oldctrls = op->o_ctrls;
-       if ( ldap_back_proxy_authz_ctrl( lc, op, rs, &op->o_ctrls ) ) {
+       if ( ldap_back_proxy_authz_ctrl( &lc->lc_bound_ndn,
+               li->li_version, &li->li_idassert, op, rs, &op->o_ctrls ) )
+       {
                op->o_ctrls = oldctrls;
                send_ldap_extended( op, rs );
                rs->sr_text = NULL;
@@ -106,15 +109,17 @@ ldap_back_exop_passwd(
                Operation       *op,
                SlapReply       *rs )
 {
-       ldapconn_t      *lc;
+       ldapinfo_t      *li = (ldapinfo_t *) op->o_bd->be_private;
+
+       ldapconn_t      *lc = NULL;
        req_pwdexop_s   *qpw = &op->oq_pwdexop;
        LDAPMessage     *res;
        ber_int_t       msgid;
        int             rc, isproxy;
        int             do_retry = 1;
+       char *text = NULL;
 
-       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
-       if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+       if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
                return -1;
        }
 
@@ -132,27 +137,21 @@ retry:
        if ( rc == LDAP_SUCCESS ) {
                if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, NULL, &res ) == -1 ) {
                        ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER, &rc );
-                       ldap_back_freeconn( op, lc, 0 );
-                       lc = NULL;
+                       rs->sr_err = rc;
 
                } else {
+                       /* only touch when activity actually took place... */
+                       if ( li->li_idle_timeout && lc ) {
+                               lc->lc_time = op->o_time;
+                       }
+
                        /* sigh. parse twice, because parse_passwd
                         * doesn't give us the err / match / msg info.
                         */
                        rc = ldap_parse_result( lc->lc_ld, res, &rs->sr_err,
                                        (char **)&rs->sr_matched,
-                                       (char **)&rs->sr_text,
+                                       &text,
                                        NULL, NULL, 0 );
-#ifndef LDAP_NULL_IS_NULL
-                       if ( rs->sr_matched && rs->sr_matched[ 0 ] == '\0' ) {
-                               free( (char *)rs->sr_matched );
-                               rs->sr_matched = NULL;
-                       }
-                       if ( rs->sr_text && rs->sr_text[ 0 ] == '\0' ) {
-                               free( (char *)rs->sr_text );
-                               rs->sr_text = NULL;
-                       }
-#endif /* LDAP_NULL_IS_NULL */
 
                        if ( rc == LDAP_SUCCESS ) {
                                if ( rs->sr_err == LDAP_SUCCESS ) {
@@ -182,6 +181,7 @@ retry:
                        ldap_msgfree( res );
                }
        }
+
        if ( rc != LDAP_SUCCESS ) {
                rs->sr_err = slap_map_api2result( rs );
                if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
@@ -190,9 +190,18 @@ retry:
                                goto retry;
                        }
                }
+
+               if ( LDAP_BACK_QUARANTINE( li ) ) {
+                       ldap_back_quarantine( op, rs );
+               }
+
+               if ( text ) rs->sr_text = text;
                send_ldap_extended( op, rs );
                /* otherwise frontend resends result */
                rc = rs->sr_err = SLAPD_ABANDON;
+
+       } else if ( LDAP_BACK_QUARANTINE( li ) ) {
+               ldap_back_quarantine( op, rs );
        }
 
        /* these have to be freed anyway... */
@@ -200,8 +209,9 @@ retry:
                free( (char *)rs->sr_matched );
                rs->sr_matched = NULL;
        }
-       if ( rs->sr_text ) {
-               free( (char *)rs->sr_text );
+
+       if ( text ) {
+               free( text );
                rs->sr_text = NULL;
        }
 
@@ -217,14 +227,16 @@ ldap_back_exop_generic(
        Operation       *op,
        SlapReply       *rs )
 {
-       ldapconn_t      *lc;
+       ldapinfo_t      *li = (ldapinfo_t *) op->o_bd->be_private;
+
+       ldapconn_t      *lc = NULL;
        LDAPMessage     *res;
        ber_int_t       msgid;
        int             rc;
        int             do_retry = 1;
+       char *text = NULL;
 
-       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
-       if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+       if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
                return -1;
        }
 
@@ -239,27 +251,21 @@ retry:
        if ( rc == LDAP_SUCCESS ) {
                if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, NULL, &res ) == -1 ) {
                        ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER, &rc );
-                       ldap_back_freeconn( op, lc, 0 );
-                       lc = NULL;
+                       rs->sr_err = rc;
 
                } else {
+                       /* only touch when activity actually took place... */
+                       if ( li->li_idle_timeout && lc ) {
+                               lc->lc_time = op->o_time;
+                       }
+
                        /* sigh. parse twice, because parse_passwd
                         * doesn't give us the err / match / msg info.
                         */
                        rc = ldap_parse_result( lc->lc_ld, res, &rs->sr_err,
                                        (char **)&rs->sr_matched,
-                                       (char **)&rs->sr_text,
+                                       &text,
                                        NULL, NULL, 0 );
-#ifndef LDAP_NULL_IS_NULL
-                       if ( rs->sr_matched && rs->sr_matched[ 0 ] == '\0' ) {
-                               free( (char *)rs->sr_matched );
-                               rs->sr_matched = NULL;
-                       }
-                       if ( rs->sr_text && rs->sr_text[ 0 ] == '\0' ) {
-                               free( (char *)rs->sr_text );
-                               rs->sr_text = NULL;
-                       }
-#endif /* LDAP_NULL_IS_NULL */
                        if ( rc == LDAP_SUCCESS ) {
                                if ( rs->sr_err == LDAP_SUCCESS ) {
                                        rc = ldap_parse_extended_result( lc->lc_ld, res,
@@ -275,6 +281,7 @@ retry:
                        ldap_msgfree( res );
                }
        }
+
        if ( rc != LDAP_SUCCESS ) {
                rs->sr_err = slap_map_api2result( rs );
                if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
@@ -283,9 +290,18 @@ retry:
                                goto retry;
                        }
                }
+
+               if ( LDAP_BACK_QUARANTINE( li ) ) {
+                       ldap_back_quarantine( op, rs );
+               }
+
+               if ( text ) rs->sr_text = text;
                send_ldap_extended( op, rs );
                /* otherwise frontend resends result */
                rc = rs->sr_err = SLAPD_ABANDON;
+
+       } else if ( LDAP_BACK_QUARANTINE( li ) ) {
+               ldap_back_quarantine( op, rs );
        }
 
        /* these have to be freed anyway... */
@@ -293,8 +309,9 @@ retry:
                free( (char *)rs->sr_matched );
                rs->sr_matched = NULL;
        }
-       if ( rs->sr_text ) {
-               free( (char *)rs->sr_text );
+
+       if ( text ) {
+               free( text );
                rs->sr_text = NULL;
        }