Fix q[-1] ref in prev commit

[openldap] / servers / slapd / ad.c

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 46be761d9f603d2301834cd64b6f77c6b8a0f999..a48c7bdc39d46b30a6a15785887ea10a051ba67f 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-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -124,21 +124,21 @@ int slap_str2ad(
 }
 
 static char *strchrlen(
-       const char *p, 
+       const char *beg, 
        const char *end,
        const char ch, 
        int *len )
 {
-       int i;
+       const char *p;
 
-       for( i=0; *p && p < end; i++,p++ ) {
+       for( p=beg; *p && p < end; p++ ) {
                if( *p == ch ) {
-                       *len = i;
+                       *len = p - beg;
                        return (char *) p;
                }
        }
 
-       *len = i;
+       *len = p - beg;
        return NULL;
 }
 
@@ -175,8 +175,9 @@ int slap_bv2ad(
        }
 
        /* find valid base attribute type; parse in place */
-       memset( &desc, 0, sizeof( desc ) );
        desc.ad_cname = *bv;
+       desc.ad_flags = 0;
+       BER_BVZERO( &desc.ad_tags );
        name = bv->bv_val;
        options = ber_bvchr( bv, ';' );
        if ( options != NULL && (unsigned) ( options - name ) < bv->bv_len ) {
@@ -200,7 +201,6 @@ int slap_bv2ad(
         * parse options in place
         */
        ntags = 0;
-       memset( tags, 0, sizeof( tags ));
        tagslen = 0;
        optn = bv->bv_val + bv->bv_len;
 
@@ -773,6 +773,24 @@ int slap_bv2undef_ad(
        return LDAP_SUCCESS;
 }
 
+AttributeDescription *
+slap_bv2tmp_ad(
+       struct berval *bv,
+       void *memctx )
+{
+       AttributeDescription *ad =
+                slap_sl_mfuncs.bmf_malloc( sizeof(AttributeDescription) +
+                       bv->bv_len + 1, memctx );
+
+       ad->ad_cname.bv_val = (char *)(ad+1);
+       strncpy( ad->ad_cname.bv_val, bv->bv_val, bv->bv_len+1 );
+       ad->ad_cname.bv_len = bv->bv_len;
+       ad->ad_flags = SLAP_DESC_TEMPORARY;
+       ad->ad_type = slap_schema.si_at_undefined;
+
+       return ad;
+}
+
 static int
 undef_promote(
        AttributeType   *at,