Plug memleak when query isn't added to cache

[openldap] / servers / slapd / overlays / dynlist.c

diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 80c3835446f7543d8f180b998fcd9be3e2b1acd0..163e4daa8552eb3e22b14ce2abfed20d046d5fb4 100644 (file)
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -1,7 +1,7 @@
 /* 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.
  *
@@ -24,6 +24,8 @@
 
 #if LDAP_VENDOR_VERSION_MINOR != X && LDAP_VENDOR_VERSION_MINOR < 3
 #define OL_2_2_COMPAT
+#elif defined(LDAP_DEVEL) && SLAPD_OVER_DYNGROUP != SLAPD_MOD_STATIC
+#define TAKEOVER_DYNGROUP
 #endif
 
 #include <stdio.h>
@@ -374,6 +376,8 @@ dynlist_send_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli )
                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 ) {
@@ -528,6 +532,7 @@ dynlist_compare( Operation *op, SlapReply *rs )
                                 * the assertion is FALSE rather than
                                 * UNDEFINED */
                                rs->sr_err = LDAP_COMPARE_FALSE;
+                               break;
                        }
 
                        return SLAP_CB_CONTINUE;
@@ -775,7 +780,34 @@ dynlist_db_config(
 
                for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
                        *dlip; dlip = &(*dlip)->dli_next )
-                       /* go to last */;
+               {
+                       /* 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>]\": "
+                                       "objectClass \"%s\" already mapped.\n",
+                                       fname, lineno, oc->soc_cname.bv_val );
+                               return 1;
+                       }
+#endif
+
+                       if ( (*dlip)->dli_ad == ad ) {
+                               Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+                                       "\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+                                       "URL attributeDescription \"%s\" already mapped.\n",
+                                       fname, lineno, ad->ad_cname.bv_val );
+                               return 1;
+                       }
+
+                       if ( member_ad != NULL && (*dlip)->dli_member_ad == member_ad ) {
+                               Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+                                       "\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+                                       "member attributeDescription \"%s\" already mapped.\n",
+                                       fname, lineno, member_ad->ad_cname.bv_val );
+                               return 1;
+                       }
+               }
 
                *dlip = (dynlist_info_t *)ch_calloc( 1, sizeof( dynlist_info_t ) );
                (*dlip)->dli_oc = oc;
@@ -843,7 +875,34 @@ dynlist_db_config(
 
                for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
                        *dlip; dlip = &(*dlip)->dli_next )
-                       /* go to last */;
+               {
+#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>\": "
+                                       "objectClass \"%s\" already mapped.\n",
+                                       fname, lineno, oc->soc_cname.bv_val );
+                               return 1;
+                       }
+#endif
+
+                       if ( (*dlip)->dli_ad == ad ) {
+                               Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+                                       "\"dynlist-attrpair <member-ad> <URL-ad>\": "
+                                       "URL attributeDescription \"%s\" already mapped.\n",
+                                       fname, lineno, ad->ad_cname.bv_val );
+                               return 1;
+                       }
+
+                       if ( member_ad != NULL && (*dlip)->dli_member_ad == member_ad ) {
+                               Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+                                       "\"dynlist-attrpair <member-ad> <URL-ad>\": "
+                                       "member attributeDescription \"%s\" already mapped.\n",
+                                       fname, lineno, member_ad->ad_cname.bv_val );
+                               return 1;
+                       }
+               }
 
                *dlip = (dynlist_info_t *)ch_calloc( 1, sizeof( dynlist_info_t ) );
                (*dlip)->dli_oc = oc;
@@ -867,6 +926,7 @@ dynlist_db_config(
 enum {
        DL_ATTRSET = 1,
        DL_ATTRPAIR,
+       DL_ATTRPAIR_COMPAT,
        DL_LAST
 };
 
@@ -884,6 +944,11 @@ static ConfigTable dlcfg[] = {
        { "dynlist-attrpair", "member-ad> <URL-ad",
                3, 3, 0, ARG_MAGIC|DL_ATTRPAIR, dl_cfgen,
                        NULL, NULL, NULL },
+#ifdef TAKEOVER_DYNGROUP
+       { "attrpair", "member-ad> <URL-ad",
+               3, 3, 0, ARG_MAGIC|DL_ATTRPAIR_COMPAT, dl_cfgen,
+                       NULL, NULL, NULL },
+#endif
        { NULL, NULL, 0, 0, 0, ARG_IGNORED }
 };
 
@@ -932,6 +997,7 @@ dl_cfgen( ConfigArgs *c )
                        }
                        break;
 
+               case DL_ATTRPAIR_COMPAT:
                case DL_ATTRPAIR:
                        rc = 1;
                        break;
@@ -979,6 +1045,7 @@ dl_cfgen( ConfigArgs *c )
                        }
                        break;
 
+               case DL_ATTRPAIR_COMPAT:
                case DL_ATTRPAIR:
                        rc = 1;
                        break;
@@ -1046,6 +1113,43 @@ dl_cfgen( ConfigArgs *c )
                        }
                }
 
+               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>]\": "
+                                       "objectClass \"%s\" already mapped.\n",
+                                       oc->soc_cname.bv_val );
+                               Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+                                       c->log, c->msg, 0 );
+                               return 1;
+                       }
+#endif
+
+                       if ( (*dlip)->dli_ad == ad ) {
+                               snprintf( c->msg, sizeof( c->msg ),
+                                       "\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+                                       "URL attributeDescription \"%s\" already mapped.\n",
+                                       ad->ad_cname.bv_val );
+                               Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+                                       c->log, c->msg, 0 );
+                               return 1;
+                       }
+
+                       if ( member_ad != NULL && (*dlip)->dli_member_ad == member_ad ) {
+                               snprintf( c->msg, sizeof( c->msg ),
+                                       "\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+                                       "member attributeDescription \"%s\" already mapped.\n",
+                                       member_ad->ad_cname.bv_val );
+                               Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+                                       c->log, c->msg, 0 );
+                               return 1;
+                       }
+               }
+
                if ( c->valx > 0 ) {
                        int     i;
 
@@ -1082,6 +1186,13 @@ dl_cfgen( ConfigArgs *c )
 
                } break;
 
+       case DL_ATTRPAIR_COMPAT:
+               snprintf( c->msg, sizeof( c->msg ),
+                       "warning: \"attrpair\" only supported for limited "
+                       "backward compatibility with overlay \"dyngroup\"" );
+               Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
+               /* fallthru */
+
        case DL_ATTRPAIR: {
                dynlist_info_t          **dlip;
                ObjectClass             *oc = NULL;
@@ -1134,7 +1245,40 @@ dl_cfgen( ConfigArgs *c )
 
                for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
                        *dlip; dlip = &(*dlip)->dli_next )
-                               /* goto last */;
+               {
+                       /* 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>\": "
+                                       "objectClass \"%s\" already mapped.\n",
+                                       oc->soc_cname.bv_val );
+                               Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+                                       c->log, c->msg, 0 );
+                               return 1;
+                       }
+#endif
+
+                       if ( (*dlip)->dli_ad == ad ) {
+                               snprintf( c->msg, sizeof( c->msg ),
+                                       "\"dynlist-attrpair <member-ad> <URL-ad>\": "
+                                       "URL attributeDescription \"%s\" already mapped.\n",
+                                       ad->ad_cname.bv_val );
+                               Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+                                       c->log, c->msg, 0 );
+                               return 1;
+                       }
+
+                       if ( member_ad != NULL && (*dlip)->dli_member_ad == member_ad ) {
+                               snprintf( c->msg, sizeof( c->msg ),
+                                       "\"dynlist-attrpair <member-ad> <URL-ad>\": "
+                                       "member attributeDescription \"%s\" already mapped.\n",
+                                       member_ad->ad_cname.bv_val );
+                               Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+                                       c->log, c->msg, 0 );
+                               return 1;
+                       }
+               }
 
                *dlip = (dynlist_info_t *)ch_calloc( 1, sizeof( dynlist_info_t ) );
 
@@ -1231,7 +1375,13 @@ dynlist_db_destroy(
        return 0;
 }
 
-static slap_overinst dynlist = { { NULL } };
+static slap_overinst   dynlist = { { NULL } };
+#ifdef TAKEOVER_DYNGROUP
+static char            *obsolete_names[] = {
+       "dyngroup",
+       NULL
+};
+#endif
 
 #if SLAPD_OVER_DYNLIST == SLAPD_MOD_DYNAMIC
 static
@@ -1244,6 +1394,12 @@ dynlist_initialize(void)
 #endif
 
        dynlist.on_bi.bi_type = "dynlist";
+
+#ifdef TAKEOVER_DYNGROUP
+       /* makes dynlist incompatible with dyngroup */
+       dynlist.on_bi.bi_obsolete_names = obsolete_names;
+#endif
+
 #ifdef OL_2_2_COMPAT
        dynlist.on_bi.bi_db_config = dynlist_db_config;
 #else