mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix do/don't send result logic

Browse Source
This commit is contained in:
Howard Chu 2003-02-19 00:01:22 +00:00
parent 1a8a5dc544
commit 9f0598034e
8 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,7 +187,7 @@ ldap_back_add(
free( mdn.bv_val );
}
return( ldap_back_op_result( li, lc, conn, op, msgid, j ) );
return( ldap_back_op_result( li, lc, conn, op, msgid, j, 1 ) );
}
#ifdef ENABLE_REWRITE

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

@ -95,8 +95,8 @@ struct ldapconn *ldap_back_getconn(struct ldapinfo *li, struct slap_conn *conn,
struct slap_op *op);
int ldap_back_dobind(struct ldapinfo *li, struct ldapconn *lc, Connection *conn, Operation *op);
int ldap_back_map_result(int err);
int ldap_back_op_result(struct ldapinfo *li, struct ldapconn *lc, Connection *conn, Operation *op,
ber_int_t msgid, int rc);
int ldap_back_op_result(struct ldapinfo *li, struct ldapconn *lc,
Connection *conn, Operation *op, ber_int_t msgid, int rc, int sendok);
int back_ldap_LTX_init_module(int argc, char *argv[]);
void ldap_back_dn_massage(struct ldapinfo *li, struct berval *dn,

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

@ -116,7 +116,7 @@ ldap_back_bind(
/* method is always LDAP_AUTH_SIMPLE if we got here */
rc = ldap_sasl_bind(lc->ld, mdn.bv_val, LDAP_SASL_SIMPLE,
cred, op->o_ctrls, NULL, &msgid);
rc = ldap_back_op_result( li, lc, conn, op, msgid, rc );
rc = ldap_back_op_result( li, lc, conn, op, msgid, rc, 1 );
if (rc == LDAP_SUCCESS) {
lc->bound = 1;
if ( mdn.bv_val != dn->bv_val ) {
@ -419,7 +419,7 @@ ldap_back_dobind( struct ldapinfo *li, struct ldapconn *lc, Connection *conn, Op
if ( !lc->bound ) {
rc = ldap_sasl_bind(lc->ld, lc->bound_dn.bv_val,
LDAP_SASL_SIMPLE, &lc->cred, NULL, NULL, &msgid);
rc = ldap_back_op_result( li, lc, conn, op, msgid, rc );
rc = ldap_back_op_result( li, lc, conn, op, msgid, rc, 0 );
if (rc == LDAP_SUCCESS) {
lc->bound = 1;
}
@ -493,10 +493,11 @@ ldap_back_map_result(int err)
int
ldap_back_op_result(struct ldapinfo *li, struct ldapconn *lc,
Connection *conn, Operation *op, ber_int_t msgid, int err)
Connection *conn, Operation *op, ber_int_t msgid, int err, int sendok)
{
char *msg = NULL;
char *match = NULL;
char *mmatch = NULL;
LDAPMessage *res;
int rc;
@ -514,7 +515,6 @@ ldap_back_op_result(struct ldapinfo *li, struct ldapconn *lc,
/* internal ops must not reply to client */
if ( conn && !op->o_do_not_cache ) {
char *mmatch = NULL;
#ifdef ENABLE_REWRITE
if (match) {
@ -535,10 +535,12 @@ ldap_back_op_result(struct ldapinfo *li, struct ldapconn *lc,
mmatch = mdn.bv_val;
}
#endif
send_ldap_result( conn, op, err, mmatch, msg, NULL, NULL );
if (mmatch != match) free(mmatch);
}
}
if (sendok || err != LDAP_SUCCESS) {
send_ldap_result( conn, op, err, mmatch, msg, NULL, NULL );
}
if (mmatch != match) free(mmatch);
if ( match ) free( match );
if ( msg ) free( msg );
return( (err==LDAP_SUCCESS) ? 0 : -1 );

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

@ -124,5 +124,5 @@ ldap_back_compare(
free( mdn.bv_val );
}
return( ldap_back_op_result( li, lc, conn, op, msgid, rc ) );
return( ldap_back_op_result( li, lc, conn, op, msgid, rc, 1 ) );
}

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

@ -105,5 +105,5 @@ ldap_back_delete(
free( mdn.bv_val );
}
return( ldap_back_op_result( li, lc, conn, op, msgid, rc ) );
return( ldap_back_op_result( li, lc, conn, op, msgid, rc, 1 ) );
}

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

@ -171,6 +171,6 @@ cleanup:;
ch_free(modv[i]->mod_bvalues);
ch_free(mods);
ch_free(modv);
return( ldap_back_op_result( li, lc, conn, op, msgid, rc ));
return( ldap_back_op_result( li, lc, conn, op, msgid, rc, 1 ));
}

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

@ -159,5 +159,5 @@ ldap_back_modrdn(
free( mnewSuperior.bv_val );
}
return( ldap_back_op_result( li, lc, conn, op, msgid, rc ) );
return( ldap_back_op_result( li, lc, conn, op, msgid, rc, 1 ) );
}

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

@ -265,7 +265,7 @@ ldap_back_search(
: NULL, slimit, &msgid);
if ( rc != LDAP_SUCCESS ) {
fail:;
rc = ldap_back_op_result(li, lc, conn, op, msgid, rc);
rc = ldap_back_op_result(li, lc, conn, op, msgid, rc, 0);
goto finish;
}