Partially revert prev commit, leave rs->sr_err == SLAPD_ABANDON

[openldap] / servers / slapd / ad.c

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index af487b29f3118b51cbc1fde59c97099e99cd50fc..c881612799f6492f5782efa83204fb7df14e71ed 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,6 +27,10 @@
 #include "slap.h"
 #include "lutil.h"
 
+static struct berval bv_no_attrs = BER_BVC( LDAP_NO_ATTRS );
+static struct berval bv_all_user_attrs = BER_BVC( "*" );
+static struct berval bv_all_operational_attrs = BER_BVC( "+" );
+
 static AttributeName anlist_no_attrs[] = {
        { BER_BVC( LDAP_NO_ATTRS ), NULL, 0, NULL },
        { BER_BVNULL, NULL, 0, NULL }
@@ -53,17 +57,23 @@ AttributeName *slap_anlist_all_user_attributes = anlist_all_user_attributes;
 AttributeName *slap_anlist_all_operational_attributes = anlist_all_operational_attributes;
 AttributeName *slap_anlist_all_attributes = anlist_all_attributes;
 
+struct berval * slap_bv_no_attrs = &bv_no_attrs;
+struct berval * slap_bv_all_user_attrs = &bv_all_user_attrs;
+struct berval * slap_bv_all_operational_attrs = &bv_all_operational_attrs;
+
 typedef struct Attr_option {
        struct berval name;     /* option name or prefix */
        int           prefix;   /* NAME is a tag and range prefix */
 } Attr_option;
 
-static Attr_option lang_option = { { sizeof("lang-")-1, "lang-" }, 1 };
+static Attr_option lang_option = { BER_BVC("lang-"), 1 };
 
 /* Options sorted by name, and number of options */
 static Attr_option *options = &lang_option;
 static int option_count = 1;
 
+static int msad_range_hack = 0;
+
 static Attr_option *ad_find_option_definition( const char *opt, int optlen );
 
 static int ad_keystring(
@@ -76,7 +86,9 @@ static int ad_keystring(
        }
 
        for( i=1; i<bv->bv_len; i++ ) {
-               if( !AD_CHAR( bv->bv_val[i] ) ) {
+               if( !AD_CHAR( bv->bv_val[i] )) {
+                       if ( msad_range_hack && bv->bv_val[i] == '=' )
+                               continue;
                        return 1;
                }
        }
@@ -213,8 +225,8 @@ int slap_bv2ad(
                        *text = "zero length option is invalid";
                        return rtn;
                
-               } else if ( optlen == sizeof("binary")-1 &&
-                       strncasecmp( opt, "binary", sizeof("binary")-1 ) == 0 )
+               } else if ( optlen == STRLENOF("binary") &&
+                       strncasecmp( opt, "binary", STRLENOF("binary") ) == 0 )
                {
                        /* binary option */
                        if( slap_ad_is_binary( &desc ) ) {
@@ -234,7 +246,8 @@ int slap_bv2ad(
                } else if ( ad_find_option_definition( opt, optlen ) ) {
                        int i;
 
-                       if( opt[optlen-1] == '-' ) {
+                       if( opt[optlen-1] == '-' ||
+                               ( opt[optlen-1] == '=' && msad_range_hack )) {
                                desc.ad_flags |= SLAP_DESC_TAG_RANGE;
                        }
 
@@ -356,10 +369,10 @@ done:;
                if (desc.ad_tags.bv_len || desc.ad_flags != SLAP_DESC_NONE) {
                        dlen = desc.ad_type->sat_cname.bv_len + 1;
                        if (desc.ad_tags.bv_len) {
-                               dlen += 1+desc.ad_tags.bv_len;
+                               dlen += 1 + desc.ad_tags.bv_len;
                        }
-                       if( slap_ad_is_binary( &desc ) ) {
-                               dlen += sizeof(";binary")+desc.ad_tags.bv_len;
+                       if ( slap_ad_is_binary( &desc ) ) {
+                               dlen += 1 + STRLENOF(";binary") + desc.ad_tags.bv_len;
                        }
                }
 
@@ -384,7 +397,7 @@ done:;
                                lp = NULL;
                                if( desc.ad_tags.bv_len ) {
                                        lp = desc.ad_tags.bv_val;
-                                       while( strncasecmp(lp, "binary", sizeof("binary")-1) < 0
+                                       while( strncasecmp(lp, "binary", STRLENOF("binary")) < 0
                                               && (lp = strchr( lp, ';' )) != NULL )
                                                ++lp;
                                        if( lp != desc.ad_tags.bv_val ) {
@@ -817,7 +830,10 @@ undef_promote(
 
                        *u_ad = (*u_ad)->ad_next;
 
+                       tmp->ad_type = nat;
                        tmp->ad_next = NULL;
+                       /* ad_cname was contiguous, no leak here */
+                       tmp->ad_cname = nat->sat_cname;
                        *n_ad = tmp;
                        n_ad = &tmp->ad_next;
                } else {
@@ -963,10 +979,8 @@ str2anlist( AttributeName *an, char *in, const char *brkstr )
        return( an );
 
 reterr:
-       for ( i = 0; an[i].an_name.bv_val; i++ ) {
-               free( an[i].an_name.bv_val );
-       }
-       free( an );
+       anlist_free( an, 1, NULL );
+
        /*
         * overwrites input string
         * on error!
@@ -976,6 +990,24 @@ reterr:
        return NULL;
 }
 
+void
+anlist_free( AttributeName *an, int freename, void *ctx )
+{
+       if ( an == NULL ) {
+               return;
+       }
+
+       if ( freename ) {
+               int     i;
+
+               for ( i = 0; an[i].an_name.bv_val; i++ ) {
+                       ber_memfree_x( an[i].an_name.bv_val, ctx );
+               }
+       }
+
+       ber_memfree_x( an, ctx );
+}
+
 char **anlist2charray_x( AttributeName *an, int dup, void *ctx )
 {
     char **attrs;
@@ -1133,7 +1165,7 @@ file2anlist( AttributeName *an, const char *fname, const char *brkstr )
                }
                an = str2anlist( an, line, brkstr );
                if ( an == NULL )
-                       return NULL;
+                       break;
                lcur = line;
        }
        ch_free( line );
@@ -1159,6 +1191,11 @@ ad_define_option( const char *name, const char *fname, int lineno )
        optlen = 0;
        do {
                if ( !DESC_CHAR( name[optlen] ) ) {
+                       /* allow trailing '=', same as '-' */
+                       if ( name[optlen] == '=' && !name[optlen+1] ) {
+                               msad_range_hack = 1;
+                               continue;
+                       }
                        Debug( LDAP_DEBUG_ANY,
                               "%s: line %d: illegal option name \"%s\"\n",
                                    fname, lineno, name );
@@ -1185,7 +1222,8 @@ ad_define_option( const char *name, const char *fname, int lineno )
 
        options[i].name.bv_val = ch_strdup( name );
        options[i].name.bv_len = optlen;
-       options[i].prefix = (name[optlen-1] == '-');
+       options[i].prefix = (name[optlen-1] == '-') ||
+               (name[optlen-1] == '=');
 
        if ( i != option_count &&
             options[i].prefix &&