From 009191da737b5ab0c6c1774cd99476e8925aaa88 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 31 Jul 2003 08:41:11 +0000 Subject: [PATCH] delete incorrect URI description. RFC 2255 should be used. --- servers/slapd/saslauthz.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c index de7843524c..151da5cdc4 100644 --- a/servers/slapd/saslauthz.c +++ b/servers/slapd/saslauthz.c @@ -65,8 +65,6 @@ int slap_sasl_setpolicy( const char *arg ) return rc; } -/* URI format: ldap:///[?[][?[][?[]]]] */ - static int slap_parseURI( Operation *op, struct berval *uri, struct berval *searchbase, int *scope, Filter **filter ) { @@ -84,7 +82,8 @@ static int slap_parseURI( Operation *op, struct berval *uri, LDAP_LOG( TRANSPORT, ENTRY, "slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 ); #else - Debug( LDAP_DEBUG_TRACE, "slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, + "slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 ); #endif /* If it does not look like a URI, assume it is a DN */ @@ -114,8 +113,8 @@ is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); if (( ludp->lud_host && *ludp->lud_host ) || ludp->lud_attrs || ludp->lud_exts ) { - /* host part should be empty */ - /* attrs and extensions parts should be empty */ + /* host part must be empty */ + /* attrs and extensions parts must be empty */ return LDAP_PROTOCOL_ERROR; } @@ -385,7 +384,8 @@ static int sasl_sc_smatch( Operation *o, SlapReply *rs ) */ static -int slap_sasl_match(Operation *opx, struct berval *rule, struct berval *assertDN, struct berval *authc ) +int slap_sasl_match( Operation *opx, struct berval *rule, + struct berval *assertDN, struct berval *authc ) { int rc; regex_t reg; @@ -404,7 +404,8 @@ int slap_sasl_match(Operation *opx, struct berval *rule, struct berval *assertDN assertDN->bv_val, rule->bv_val, 0 ); #endif - rc = slap_parseURI( opx, rule, &op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter ); + rc = slap_parseURI( opx, rule, + &op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter ); if( rc != LDAP_SUCCESS ) goto CONCLUDED; /* Massive shortcut: search scope == base */ @@ -575,7 +576,8 @@ void slap_sasl2dn( Operation *opx, goto FINISHED; } - rc = slap_parseURI( opx, ®out, &op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter ); + rc = slap_parseURI( opx, ®out, + &op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter ); if( regout.bv_val ) sl_free( regout.bv_val, opx->o_tmpmemctx ); if( rc != LDAP_SUCCESS ) { goto FINISHED; -- 2.39.5