mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

trim unnecessary args

Browse Source
This commit is contained in:
Pierangelo Masarati 2003-04-03 23:23:56 +00:00
parent 44c2d8a771
commit ebe0bb0b52
10 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/slapd/back-ldap/add.c
View File

@ -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 );
}

4
servers/slapd/back-ldap/back-ldap.h
View File

@ -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);

8
servers/slapd/back-ldap/bind.c
View File

@ -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;

4
servers/slapd/back-ldap/compare.c
View File

@ -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 );
}

4
servers/slapd/back-ldap/config.c
View File

@ -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;

4
servers/slapd/back-ldap/delete.c
View File

@ -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 );
}

4
servers/slapd/back-ldap/extended.c
View File

@ -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;
}

4
servers/slapd/back-ldap/modify.c
View File

@ -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 );
}

4
servers/slapd/back-ldap/modrdn.c
View File

@ -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 );
}

8
servers/slapd/back-ldap/search.c
View File

@ -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;