/* dynlist.c - dynamic list overlay */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2005 The OpenLDAP Foundation.
+ * Copyright 2003-2006 The OpenLDAP Foundation.
* Portions Copyright 2004-2005 Pierangelo Masarati.
* All rights reserved.
*
o.ors_scope = lud->lud_scope;
if ( dli->dli_member_ad != NULL ) {
+ /* if ( lud->lud_attrs != NULL ),
+ * the URL should be ignored */
o.ors_attrs = slap_anlist_no_attrs;
} else if ( lud->lud_attrs == NULL ) {
op->o_tmpfree( o.ors_filterstr.bv_val, op->o_tmpmemctx );
lud->lud_filter = NULL;
}
- if ( lud ) {
- ldap_free_urldesc( lud );
- }
+ ldap_free_urldesc( lud );
}
rs->sr_entry = e;
* the assertion is FALSE rather than
* UNDEFINED */
rs->sr_err = LDAP_COMPARE_FALSE;
+ break;
}
return SLAP_CB_CONTINUE;
for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
*dlip; dlip = &(*dlip)->dli_next )
{
+ /* The check on objectClass may be relaxed */
+#if 0
if ( (*dlip)->dli_oc == oc ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
fname, lineno, oc->soc_cname.bv_val );
return 1;
}
+#endif
if ( (*dlip)->dli_ad == ad ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
*dlip; dlip = &(*dlip)->dli_next )
{
+#if 0
+ /* The check on objectClass may be relaxed */
if ( (*dlip)->dli_oc == oc ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"\"dynlist-attrpair <member-ad> <URL-ad>\": "
fname, lineno, oc->soc_cname.bv_val );
return 1;
}
+#endif
if ( (*dlip)->dli_ad == ad ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
*dlip; dlip = &(*dlip)->dli_next )
{
+ /* The check on objectClass may be relaxed */
+#if 0
if ( (*dlip)->dli_oc == oc ) {
snprintf( c->msg, sizeof( c->msg ),
"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
c->log, c->msg, 0 );
return 1;
}
+#endif
if ( (*dlip)->dli_ad == ad ) {
snprintf( c->msg, sizeof( c->msg ),
for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
*dlip; dlip = &(*dlip)->dli_next )
{
+ /* The check on objectClass may be relaxed */
+#if 0
if ( (*dlip)->dli_oc == oc ) {
snprintf( c->msg, sizeof( c->msg ),
"\"dynlist-attrpair <member-ad> <URL-ad>\": "
c->log, c->msg, 0 );
return 1;
}
+#endif
if ( (*dlip)->dli_ad == ad ) {
snprintf( c->msg, sizeof( c->msg ),