trim unnecessary args

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index 2f54cef58fab3b923d6ddb562f3bf2ea3f9566e5..d2ec162cdd3f4d1bc5e95bbd1874b333036c1b69 100644 (file)
--- a/servers/slapd/back-ldap/add.c
+++ b/servers/slapd/back-ldap/add.c
@@ -65,8 +65,8 @@ ldap_back_add(
        Debug(LDAP_DEBUG_ARGS, "==> ldap_back_add: %s\n", op->o_req_dn.bv_val, 0, 0);
 #endif /* !NEW_LOGGING */
        
-       lc = ldap_back_getconn(li, op, rs);
-       if ( !lc || !ldap_back_dobind( li, lc, op, rs ) ) {
+       lc = ldap_back_getconn(op, rs);
+       if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
                return( -1 );
        }
 

diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h
index 9d5f0eac6a2572a761e5e9d5153f3cca8eaca4c1..a329382bed04c511fce06d53d5444c4497cdf935 100644 (file)
--- a/servers/slapd/back-ldap/back-ldap.h
+++ b/servers/slapd/back-ldap/back-ldap.h
@@ -91,8 +91,8 @@ struct ldapinfo {
        struct ldapmap at_map;
 };
 
-struct ldapconn *ldap_back_getconn(struct ldapinfo *li, struct slap_op *op, struct slap_rep *rs);
-int ldap_back_dobind(struct ldapinfo *li, struct ldapconn *lc, Operation *op, SlapReply *rs);
+struct ldapconn *ldap_back_getconn(struct slap_op *op, struct slap_rep *rs);
+int ldap_back_dobind(struct ldapconn *lc, Operation *op, SlapReply *rs);
 int ldap_back_map_result(int err);
 int ldap_back_op_result(struct ldapinfo *li, struct ldapconn *lc,
        Operation *op, SlapReply *rs, ber_int_t msgid, int rc, int sendok);

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index d3af1ee43ec113010d3d3a05308673b8cf360352..6bb8ec0a9d5e61bfd61dda7dd94069e1faff739b 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -63,7 +63,7 @@ ldap_back_bind(
        int rc = 0;
        ber_int_t msgid;
 
-       lc = ldap_back_getconn(li, op, rs);
+       lc = ldap_back_getconn(op, rs);
        if ( !lc ) {
                return( -1 );
        }
@@ -236,8 +236,9 @@ static void myprint( Avlnode *root )
 #endif /* PRINT_CONNTREE */
 
 struct ldapconn *
-ldap_back_getconn(struct ldapinfo *li, Operation *op, SlapReply *rs)
+ldap_back_getconn(Operation *op, SlapReply *rs)
 {
+       struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
        struct ldapconn *lc, lc_curr;
        LDAP *ld;
        int is_priv = 0;
@@ -429,8 +430,9 @@ ldap_back_getconn(struct ldapinfo *li, Operation *op, SlapReply *rs)
  * it can be used to simplify the check.
  */
 int
-ldap_back_dobind( struct ldapinfo *li, struct ldapconn *lc, Operation *op, SlapReply *rs )
+ldap_back_dobind( struct ldapconn *lc, Operation *op, SlapReply *rs )
 {      
+       struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
        int rc;
        ber_int_t msgid;
 

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index 0e1cc872276ae470b69e7865142c78c2dbf57174..f17dfaf9c86c9db1d3e028a5de265f70283b0354 100644 (file)
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -57,8 +57,8 @@ ldap_back_compare(
        int rc;
        ber_int_t msgid;
 
-       lc = ldap_back_getconn(li, op, rs);
-       if (!lc || !ldap_back_dobind( li, lc, op, rs ) ) {
+       lc = ldap_back_getconn(op, rs);
+       if (!lc || !ldap_back_dobind( lc, op, rs ) ) {
                return( -1 );
        }
 

diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index f1eadd992a8e9ce2d03a961cd09cc6e373577795..dcc22ff65d5c578b89ef7bb0d81eb39424bcc4db 100644 (file)
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -439,8 +439,8 @@ ldap_back_exop_whoami(
                ber_int_t msgid;
 
                op2.o_ndn = op->o_conn->c_ndn;
-               lc = ldap_back_getconn(li, &op2, rs);
-               if (!lc || !ldap_back_dobind( li, lc, op, rs )) {
+               lc = ldap_back_getconn(&op2, rs);
+               if (!lc || !ldap_back_dobind( lc, op, rs )) {
                        return -1;
                }
                c.ldctl_oid = LDAP_CONTROL_PROXY_AUTHZ;

diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index f6a88c5d8e8a09f36cd66ae731316178473c9f68..e34137613fd76e1d9d8284343850a4d6240f1d79 100644 (file)
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -57,9 +57,9 @@ ldap_back_delete(
 
        struct berval mdn = { 0, NULL };
 
-       lc = ldap_back_getconn( li, op, rs );
+       lc = ldap_back_getconn( op, rs );
        
-       if ( !lc || !ldap_back_dobind( li, lc, op, rs ) ) {
+       if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
                return( -1 );
        }
 

diff --git a/servers/slapd/back-ldap/extended.c b/servers/slapd/back-ldap/extended.c
index 5b839bee01acb9806eb8a8d2f0e8837a190d508e..e5043d6a72d4b2e40756509a5aa99db1dfdbc8bc 100644 (file)
--- a/servers/slapd/back-ldap/extended.c
+++ b/servers/slapd/back-ldap/extended.c
@@ -56,8 +56,8 @@ ldap_back_exop_passwd(
        ber_int_t msgid;
        int rc;
 
-       lc = ldap_back_getconn(li, op, rs);
-       if (!lc || !ldap_back_dobind(li, lc, op, rs) ) {
+       lc = ldap_back_getconn(op, rs);
+       if (!lc || !ldap_back_dobind(lc, op, rs) ) {
                return -1;
        }
 

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 3890fdbad6a38f017f4b523817592859a0bf904f..0695021bf8d9581c7a6ae73a511b4cba7ac54be3 100644 (file)
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -60,8 +60,8 @@ ldap_back_modify(
        struct berval mdn = { 0, NULL };
        ber_int_t msgid;
 
-       lc = ldap_back_getconn(li, op, rs);
-       if ( !lc || !ldap_back_dobind( li, lc, op, rs ) ) {
+       lc = ldap_back_getconn(op, rs);
+       if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
                return( -1 );
        }
 

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index b44b7c0c5529aa99193fcd8228c2dc911a515efb..a00f4a88600c38295dcd7277d49a51408dd7af36 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -57,8 +57,8 @@ ldap_back_modrdn(
 
        struct berval mdn = { 0, NULL }, mnewSuperior = { 0, NULL };
 
-       lc = ldap_back_getconn( li, op, rs );
-       if ( !lc || !ldap_back_dobind(li, lc, op, rs) ) {
+       lc = ldap_back_getconn( op, rs );
+       if ( !lc || !ldap_back_dobind(lc, op, rs) ) {
                return( -1 );
        }
 

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 945649d180c563ca01592c1adddb962fc3361ea4..1a6f192609f63e847e21b3a93b4f4b313f227239 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -69,7 +69,7 @@ ldap_back_search(
        struct slap_limits_set *limit = NULL;
        int isroot = 0;
 
-       lc = ldap_back_getconn(li, op, rs);
+       lc = ldap_back_getconn(op, rs);
        if ( !lc ) {
                return( -1 );
        }
@@ -78,7 +78,7 @@ ldap_back_search(
         * FIXME: in case of values return filter, we might want
         * to map attrs and maybe rewrite value
         */
-       if ( !ldap_back_dobind( li, lc, op, rs ) ) {
+       if ( !ldap_back_dobind( lc, op, rs ) ) {
                return( -1 );
        }
 
@@ -648,10 +648,10 @@ ldap_back_entry_get(
        /* Tell getconn this is a privileged op */
        is_oc = op->o_do_not_cache;
        op->o_do_not_cache = 1;
-       lc = ldap_back_getconn(li, op, &rs);
+       lc = ldap_back_getconn(op, &rs);
        oconn = op->o_conn;
        op->o_conn = NULL;
-       if ( !lc || !ldap_back_dobind(li, lc, op, &rs) ) {
+       if ( !lc || !ldap_back_dobind(lc, op, &rs) ) {
                op->o_do_not_cache = is_oc;
                op->o_conn = oconn;
                return 1;