#include "slap.h"
#include "back-ldap.h"
+#include "../../../libraries/libldap/ldap-int.h"
static void ldap_send_entry( Backend *be, Operation *op, struct ldapconn *lc,
- LDAPMessage *e, char **attrs, int attrsonly );
+ LDAPMessage *e, AttributeName *attrs, int attrsonly );
int
ldap_back_search(
Backend *be,
Connection *conn,
Operation *op,
- const char *base,
- const char *nbase,
+ struct berval *base,
+ struct berval *nbase,
int scope,
int deref,
int slimit,
int tlimit,
Filter *filter,
- const char *filterstr,
- char **attrs,
+ struct berval *filterstr,
+ AttributeName *attrs,
int attrsonly
)
{
LDAPMessage *res, *e;
int count, rc = 0, msgid, sres = LDAP_SUCCESS;
char *match = NULL, *err = NULL;
- char *mbase = NULL, *mapped_filter = NULL, **mapped_attrs = NULL;
+ char *mapped_filter = NULL, **mapped_attrs = NULL;
+ struct berval mbase;
#ifdef ENABLE_REWRITE
- char *mfilter = NULL, *mmatch = NULL;
+ char *mmatch = NULL;
+ struct berval mfilter = { 0, NULL };
#endif /* ENABLE_REWRITE */
struct slap_limits_set *limit = NULL;
int isroot = 0;
}
/* if not root, get appropriate limits */
- if ( be_isroot( be, op->o_ndn ) ) {
+ if ( be_isroot( be, &op->o_ndn ) ) {
isroot = 1;
} else {
- ( void ) get_limits( be, op->o_ndn, &limit );
+ ( void ) get_limits( be, &op->o_ndn, &limit );
}
/* if no time limit requested, rely on remote server limits */
*/
#ifdef ENABLE_REWRITE
switch ( rewrite_session( li->rwinfo, "searchBase",
- base, conn, &mbase ) ) {
+ base->bv_val, conn, &mbase.bv_val ) ) {
case REWRITE_REGEXEC_OK:
- if ( mbase == NULL ) {
- mbase = ( char * )base;
+ if ( mbase.bv_val == NULL ) {
+ mbase.bv_val = ( char * )base->bv_val;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] searchBase: \"%s\" -> \"%s\"\n%",
- base, mbase ));
+ base->bv_val, mbase.bv_val ));
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> searchBase: \"%s\" -> \"%s\"\n%s",
- base, mbase, "" );
+ base->bv_val, mbase.bv_val, "" );
#endif /* !NEW_LOGGING */
break;
* Rewrite the search filter, if required
*/
switch ( rewrite_session( li->rwinfo, "searchFilter",
- filterstr, conn, &mfilter ) ) {
+ filterstr->bv_val, conn, &mfilter.bv_val ) ) {
case REWRITE_REGEXEC_OK:
- if ( mfilter == NULL || mfilter[0] == '\0') {
- if ( mfilter != NULL ) {
- free( mfilter );
+ if ( mfilter.bv_val == NULL || mfilter.bv_val[0] == '\0') {
+ if ( mfilter.bv_val != NULL ) {
+ free( mfilter.bv_val );
}
- mfilter = ( char * )filterstr;
+ mfilter = *filterstr;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] searchFilter: \"%s\" -> \"%s\"\n",
- filterstr, mfilter ));
+ filterstr->bv_val, mfilter.bv_val ));
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> searchFilter: \"%s\" -> \"%s\"\n%s",
- filterstr, mfilter, "" );
+ filterstr->bv_val, mfilter.bv_val, "" );
#endif /* !NEW_LOGGING */
break;
goto finish;
}
#else /* !ENABLE_REWRITE */
- mbase = ldap_back_dn_massage( li, ch_strdup( base ), 0 );
+ ldap_back_dn_massage( li, base, &mbase, 0, 1 );
#endif /* !ENABLE_REWRITE */
mapped_filter = ldap_back_map_filter(&li->at_map, &li->oc_map,
#ifdef ENABLE_REWRITE
- (char *)mfilter,
+ &mfilter,
#else /* !ENABLE_REWRITE */
- (char *)filterstr,
+ filterstr,
#endif /* !ENABLE_REWRITE */
0);
if ( mapped_filter == NULL ) {
#ifdef ENABLE_REWRITE
- mapped_filter = (char *)mfilter;
+ mapped_filter = mfilter.bv_val;
#else /* !ENABLE_REWRITE */
- mapped_filter = (char *)filterstr;
+ mapped_filter = filterstr->bv_val;
#endif /* !ENABLE_REWRITE */
}
mapped_attrs = ldap_back_map_attrs(&li->at_map, attrs, 0);
- if ( mapped_attrs == NULL ) {
- mapped_attrs = attrs;
+ if ( mapped_attrs == NULL && attrs) {
+ AttributeName *an;
+ for (count=0, an=attrs; an; an=an->an_next,count++);
+ mapped_attrs = ch_malloc( (count+1) * sizeof(char *));
+ for (count=0, an=attrs; an; an=an->an_next,count++) {
+ mapped_attrs[count] = an->an_name.bv_val;
+ }
+ mapped_attrs[count] = NULL;
}
- if ((msgid = ldap_search(lc->ld, mbase, scope, mapped_filter, mapped_attrs,
+ if ((msgid = ldap_search(lc->ld, mbase.bv_val, scope, mapped_filter, mapped_attrs,
attrsonly)) == -1)
{
fail:;
if ( err ) {
free( err );
}
- if ( mapped_attrs != attrs ) {
- charray_free( mapped_attrs );
+ if ( mapped_attrs ) {
+ free( mapped_attrs );
}
#ifdef ENABLE_REWRITE
- if ( mapped_filter != mfilter ) {
+ if ( mapped_filter != mfilter.bv_val ) {
free( mapped_filter );
}
- if ( mfilter != filterstr ) {
- free( mfilter );
+ if ( mfilter.bv_val != filterstr.bv_val ) {
+ free( mfilter.bv_val );
}
#else /* !ENABLE_REWRITE */
- if ( mapped_filter != filterstr ) {
+ if ( mapped_filter != filterstr->bv_val ) {
free( mapped_filter );
}
#endif /* !ENABLE_REWRITE */
-#ifdef ENABLE_REWRITE
- if ( mbase != base ) {
-#endif /* ENABLE_REWRITE */
- free( mbase );
-#ifdef ENABLE_REWRITE
+ if ( mbase.bv_val != base->bv_val ) {
+ free( mbase.bv_val );
}
-#endif /* ENABLE_REWRITE */
return rc;
}
Operation *op,
struct ldapconn *lc,
LDAPMessage *e,
- char **attrs,
+ AttributeName *attrs,
int attrsonly
)
{
struct ldapinfo *li = (struct ldapinfo *) be->be_private;
- char *a, *mapped;
+ struct berval a, mapped;
Entry ent;
- BerElement *ber = NULL;
+ BerElement ber = *e->lm_ber;
Attribute *attr, **attrp;
- struct berval *dummy = NULL;
- struct berval *bv;
+ struct berval dummy = { 0, NULL };
+ struct berval *bv, bdn;
const char *text;
-#ifdef ENABLE_REWRITE
- char *dn;
-
- dn = ldap_get_dn(lc->ld, e);
- if ( dn == NULL ) {
+ if ( ber_scanf( &ber, "{o", &bdn ) == LBER_ERROR ) {
return;
}
+#ifdef ENABLE_REWRITE
/*
* Rewrite the dn of the result, if needed
*/
switch ( rewrite_session( li->rwinfo, "searchResult",
- dn, lc->conn, &ent.e_dn ) ) {
+ dn.bv_val, lc->conn, &ent.e_name.bv_val ) ) {
case REWRITE_REGEXEC_OK:
- if ( ent.e_dn == NULL ) {
- ent.e_dn = dn;
+ if ( ent.e_name.bv_val == NULL ) {
+ ent.e_name = bdn;
+
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] searchResult: \"%s\""
- " -> \"%s\"\n", dn, ent.e_dn ));
+ " -> \"%s\"\n", dn.bv_val, ent.e_dn ));
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> searchResult: \"%s\""
- " -> \"%s\"\n%s", dn, ent.e_dn, "" );
+ " -> \"%s\"\n%s", dn.bv_val, ent.e_dn, "" );
#endif /* !NEW_LOGGING */
- free( dn );
- dn = NULL;
+ free( dn.bv_val );
+ dn.bv_val = NULL;
+ ent.e_name.bv_len = strlen( ent.e_name.bv_val );
}
break;
return;
}
#else /* !ENABLE_REWRITE */
- ent.e_dn = ldap_back_dn_restore( li, ldap_get_dn(lc->ld, e), 0 );
+ ldap_back_dn_massage( li, &bdn, &ent.e_name, 0, 0 );
#endif /* !ENABLE_REWRITE */
- ent.e_ndn = ch_strdup( ent.e_dn );
- (void) dn_normalize( ent.e_ndn );
+ dnNormalize2( NULL, &ent.e_name, &ent.e_nname );
ent.e_id = 0;
ent.e_attrs = 0;
ent.e_private = 0;
attrp = &ent.e_attrs;
- for ( a = ldap_first_attribute(lc->ld, e, &ber);
- a != NULL;
- a = ldap_next_attribute(lc->ld, e, ber))
- {
- mapped = ldap_back_map(&li->at_map, a, 1);
- if (mapped == NULL)
+ while ( ber_scanf( &ber, "{{o", &a ) != LBER_ERROR ) {
+ ldap_back_map(&li->at_map, &a, &mapped, 1);
+ if (mapped.bv_val == NULL)
continue;
attr = (Attribute *)ch_malloc( sizeof(Attribute) );
if (attr == NULL)
continue;
attr->a_next = 0;
attr->a_desc = NULL;
- if (slap_str2ad(mapped, &attr->a_desc, &text) != LDAP_SUCCESS) {
- ch_free(attr);
- continue;
+ if (slap_bv2ad(&mapped, &attr->a_desc, &text) != LDAP_SUCCESS) {
+ if (slap_bv2undef_ad(&mapped, &attr->a_desc, &text)
+ != LDAP_SUCCESS) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+ "slap_str2undef_ad(%s): "
+ "%s\n", mapped.bv_val, text ));
+#else /* !NEW_LOGGING */
+ Debug( LDAP_DEBUG_ANY,
+ "slap_str2undef_ad(%s): "
+ "%s\n%s", mapped.bv_val, text, "" );
+#endif /* !NEW_LOGGING */
+
+ ch_free(attr);
+ continue;
+ }
}
- attr->a_vals = ldap_get_values_len(lc->ld, e, a);
- if (!attr->a_vals) {
+ if (ber_scanf( &ber, "[W]", &attr->a_vals ) == LBER_ERROR ) {
attr->a_vals = &dummy;
- } else if ( strcasecmp( mapped, "objectclass" ) == 0 ) {
+ } else if ( strcasecmp( mapped.bv_val, "objectclass" ) == 0 ) {
int i, last;
- for ( last = 0; attr->a_vals[last]; last++ ) ;
- for ( i = 0; ( bv = attr->a_vals[i] ); i++ ) {
- mapped = ldap_back_map(&li->oc_map, bv->bv_val, 1);
- if (mapped == NULL) {
- ber_bvfree(attr->a_vals[i]);
- attr->a_vals[i] = NULL;
+ for ( last = 0; attr->a_vals[last].bv_val; last++ ) ;
+ for ( i = 0; ( bv = &attr->a_vals[i] ); i++ ) {
+ ldap_back_map(&li->oc_map, bv, &mapped, 1);
+ if (mapped.bv_val == NULL) {
+ free(attr->a_vals[i].bv_val);
+ attr->a_vals[i].bv_val = NULL;
if (--last < 0)
break;
attr->a_vals[i] = attr->a_vals[last];
- attr->a_vals[last] = NULL;
+ attr->a_vals[last].bv_val = NULL;
i--;
- } else if ( mapped != bv->bv_val ) {
+ } else if ( mapped.bv_val != bv->bv_val ) {
ch_free(bv->bv_val);
- bv->bv_val = ch_strdup( mapped );
- bv->bv_len = strlen( mapped );
+ ber_dupbv( bv, &mapped );
}
}
} else if ( strcmp( attr->a_desc->ad_type->sat_syntax->ssyn_oid,
SLAPD_DN_SYNTAX ) == 0 ) {
int i;
- for ( i = 0; ( bv = attr->a_vals[ i ] ); i++ ) {
+ for ( i = 0; ( bv = &attr->a_vals[ i ] ); i++ ) {
char *newval;
switch ( rewrite_session( li->rwinfo,
"[rw] searchResult on"
" attr=%s:"
" \"%s\" -> \"%s\"\n",
- attr->a_desc->ad_type->sat_cname,
+ attr->a_desc->ad_type->sat_cname.bv_val,
bv->bv_val, newval ));
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> searchResult on attr=%s: \"%s\" -> \"%s\"\n",
- attr->a_desc->ad_type->sat_cname,
+ attr->a_desc->ad_type->sat_cname.bv_val,
bv->bv_val, newval );
#endif /* !NEW_LOGGING */
while (ent.e_attrs) {
attr = ent.e_attrs;
ent.e_attrs = attr->a_next;
- ad_free(attr->a_desc, 1);
if (attr->a_vals != &dummy)
- ber_bvecfree(attr->a_vals);
+ bvarray_free(attr->a_vals);
free(attr);
}
- if (ber)
- ber_free(ber,0);
if ( ent.e_dn )
free( ent.e_dn );