servers/slapd/saslauthz.c - diff

Return to saslauthz.c CVS log

Up to [OpenLDAP] / servers / slapd

Diff for /servers/slapd/saslauthz.c between versions 1.88.2.11 and 1.88.2.13

version 1.88.2.11, 2004/04/06 18:16:01	version 1.88.2.13, 2004/04/13 22:35:20
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/saslauthz.c,v 1.88.2.10 2004/03/22 17:33:28 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/saslauthz.c,v 1.88.2.12 2004/04/12 18:20:12 kurt Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1998-2004 The OpenLDAP Foundation.	* Copyright 1998-2004 The OpenLDAP Foundation.
Line 276 is_dn: bv.bv_len = uri->bv_len - (bv.bv	Line 276 is_dn: bv.bv_len = uri->bv_len - (bv.bv
Connection c = *op->o_conn;	Connection c = *op->o_conn;
char buf[ SLAP_LDAPDN_MAXLEN ];	char buf[ SLAP_LDAPDN_MAXLEN ];
struct berval id,	struct berval id,
user = { 0, NULL },	user = BER_BVNULL,
realm = { 0, NULL },	realm = BER_BVNULL,
mech = { 0, NULL };	mech = BER_BVNULL;

if ( sizeof( buf ) <= uri->bv_len ) {	if ( sizeof( buf ) <= uri->bv_len ) {
return LDAP_INVALID_SYNTAX;	return LDAP_INVALID_SYNTAX;
Line 663 exact_match:	Line 663 exact_match:

if ( bv.bv_val[ -1 ] == ',' && dn_match( &op.o_req_ndn, &bv ) ) {	if ( bv.bv_val[ -1 ] == ',' && dn_match( &op.o_req_ndn, &bv ) ) {
switch ( op.oq_search.rs_scope ) {	switch ( op.oq_search.rs_scope ) {
	case LDAP_X_SCOPE_SUBTREE:
case LDAP_X_SCOPE_CHILDREN:	case LDAP_X_SCOPE_CHILDREN:
rc = LDAP_SUCCESS;	rc = LDAP_SUCCESS;
break;	break;
Line 750 exact_match:	Line 751 exact_match:
op.o_conn = opx->o_conn;	op.o_conn = opx->o_conn;
op.o_connid = opx->o_connid;	op.o_connid = opx->o_connid;
op.o_req_dn = op.o_req_ndn;	op.o_req_dn = op.o_req_ndn;
	op.oq_search.rs_slimit = 1;
	op.oq_search.rs_tlimit = -1;

op.o_bd->be_search( &op, &rs );	op.o_bd->be_search( &op, &rs );

Line 849 void slap_sasl2dn( Operation *opx,	Line 852 void slap_sasl2dn( Operation *opx,
slap_callback cb = { NULL, sasl_sc_sasl2dn, NULL, NULL };	slap_callback cb = { NULL, sasl_sc_sasl2dn, NULL, NULL };
Operation op = {0};	Operation op = {0};
SlapReply rs = {REP_RESULT};	SlapReply rs = {REP_RESULT};
struct berval regout = { 0, NULL };	struct berval regout = BER_BVNULL;

#ifdef NEW_LOGGING	#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, ENTRY,	LDAP_LOG( TRANSPORT, ENTRY,
Line 941 void slap_sasl2dn( Operation *opx,	Line 944 void slap_sasl2dn( Operation *opx,
#endif	#endif
op.oq_search.rs_deref = LDAP_DEREF_NEVER;	op.oq_search.rs_deref = LDAP_DEREF_NEVER;
op.oq_search.rs_slimit = 1;	op.oq_search.rs_slimit = 1;
	op.oq_search.rs_tlimit = -1;
op.oq_search.rs_attrsonly = 1;	op.oq_search.rs_attrsonly = 1;
op.o_req_dn = op.o_req_ndn;	op.o_req_dn = op.o_req_ndn;

Removed from v.1.88.2.11
changed lines
	Added in v.1.88.2.13