From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 3 Apr 2003 23:23:56 +0000 (+0000)
Subject: trim unnecessary args
X-Git-Tag: AUTOCONF_2_57~90
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ebe0bb0b52e6e1d73f0a5649071db68acc18b533;p=openldap

trim unnecessary args
---

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index 2f54cef58f..d2ec162cdd 100644
--- 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 9d5f0eac6a..a329382bed 100644
--- 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 d3af1ee43e..6bb8ec0a9d 100644
--- 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 0e1cc87227..f17dfaf9c8 100644
--- 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 f1eadd992a..dcc22ff65d 100644
--- 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 f6a88c5d8e..e34137613f 100644
--- 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 5b839bee01..e5043d6a72 100644
--- 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 3890fdbad6..0695021bf8 100644
--- 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 b44b7c0c55..a00f4a8860 100644
--- 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 945649d180..1a6f192609 100644
--- 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;