fix -ULDAP_DEVEL compile

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

diff --git a/servers/slapd/back-ldap/extended.c b/servers/slapd/back-ldap/extended.c
index 879c0ce7ca0cda8696dd01bbf65f4d56f213690d..8fb7e44a53955b55048d6d586d52692b0acb0e87 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-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,6 @@ ldap_back_extended(
        for ( i = 0; exop_table[i].extended != NULL; i++ ) {
                if ( bvmatch( exop_table[i].oid, &op->oq_extended.rs_reqoid ) )
                {
-#ifdef LDAP_BACK_PROXY_AUTHZ 
                        struct ldapconn *lc;
                        LDAPControl     **oldctrls = NULL;
                        int             rc;
@@ -57,8 +56,8 @@ ldap_back_extended(
                         * called twice; maybe we could avoid the 
                         * ldap_back_dobind() call inside each extended()
                         * call ... */
-                       lc = ldap_back_getconn( op, rs );
-                       if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
+                       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
+                       if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
                                return -1;
                        }
 
@@ -81,9 +80,6 @@ ldap_back_extended(
                        op->o_ctrls = oldctrls;
 
                        return rc;
-#else /* ! LDAP_BACK_PROXY_AUTHZ */
-                       return ( *exop_table[i].extended )( op, rs );
-#endif /* ! LDAP_BACK_PROXY_AUTHZ */
                }
        }
 
@@ -103,8 +99,8 @@ ldap_back_exop_passwd(
        int             rc, isproxy;
        int             do_retry = 1;
 
-       lc = ldap_back_getconn( op, rs );
-       if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
+       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
+       if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
                return -1;
        }
 
@@ -158,7 +154,7 @@ retry:
                rs->sr_err = slap_map_api2result( rs );
                if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
                        do_retry = 0;
-                       if ( ldap_back_retry(lc, op, rs ) ) {
+                       if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
                                goto retry;
                        }
                }