cleanup

[openldap] / servers / slapd / ad.c

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 676cf8d86f39d2881600b2d4d7907132c5c8cbf2..c9601a3a10b33be83fd806f5a9ae55763d0d4c48 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-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -124,20 +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[i]; i++ ) {
-               if( p[i] == ch ) {
-                       *len = i;
-                       return (char *) &p[i];
+       for( p=beg; *p && p < end; p++ ) {
+               if( *p == ch ) {
+                       *len = p - beg;
+                       return (char *) p;
                }
        }
 
-       *len = i;
+       *len = p - beg;
        return NULL;
 }
 
@@ -148,7 +149,7 @@ int slap_bv2ad(
 {
        int rtn = LDAP_UNDEFINED_TYPE;
        AttributeDescription desc, *d2;
-       char *name, *options;
+       char *name, *options, *optn;
        char *opt, *next;
        int ntags;
        int tagslen;
@@ -177,7 +178,7 @@ int slap_bv2ad(
        memset( &desc, 0, sizeof( desc ) );
        desc.ad_cname = *bv;
        name = bv->bv_val;
-       options = strchr( name, ';' );
+       options = ber_bvchr( bv, ';' );
        if ( options != NULL && (unsigned) ( options - name ) < bv->bv_len ) {
                /* don't go past the end of the berval! */
                desc.ad_cname.bv_len = options - name;
@@ -201,11 +202,12 @@ int slap_bv2ad(
        ntags = 0;
        memset( tags, 0, sizeof( tags ));
        tagslen = 0;
+       optn = bv->bv_val + bv->bv_len;
 
        for( opt=options; opt != NULL; opt=next ) {
                int optlen;
                opt++; 
-               next = strchrlen( opt, ';', &optlen );
+               next = strchrlen( opt, optn, ';', &optlen );
 
                if( optlen == 0 ) {
                        *text = "zero length option is invalid";
@@ -443,19 +445,21 @@ static int is_ad_subtags(
        struct berval *subtagsbv, 
        struct berval *suptagsbv )
 {
-       const char *suptags, *supp, *supdelimp;
-       const char *subtags, *subp, *subdelimp;
+       const char *suptags, *supp, *supdelimp, *supn;
+       const char *subtags, *subp, *subdelimp, *subn;
        int  suplen, sublen;
 
        subtags =subtagsbv->bv_val;
        suptags =suptagsbv->bv_val;
+       subn = subtags + subtagsbv->bv_len;
+       supn = suptags + suptagsbv->bv_len;
 
        for( supp=suptags ; supp; supp=supdelimp ) {
-               supdelimp = strchrlen( supp, ';', &suplen );
+               supdelimp = strchrlen( supp, supn, ';', &suplen );
                if( supdelimp ) supdelimp++;
 
                for( subp=subtags ; subp; subp=subdelimp ) {
-                       subdelimp = strchrlen( subp, ';', &sublen );
+                       subdelimp = strchrlen( subp, subn, ';', &sublen );
                        if( subdelimp ) subdelimp++;
 
                        if ( suplen > sublen
@@ -988,8 +992,9 @@ anlist2attrs( AttributeName * anlist )
        char **attrs;
        ObjectClass *oc;
 
-       attrs = anlist2charray( anlist, 1 );
-                                                                                
+       if ( anlist == NULL )
+               return NULL;
+
        for ( i = 0; anlist[i].an_name.bv_val; i++ ) {
                if ( ( oc = anlist[i].an_oc ) ) {
                        for ( j = 0; oc->soc_required && oc->soc_required[j]; j++ ) ;
@@ -1002,6 +1007,8 @@ anlist2attrs( AttributeName * anlist )
        if ( i == 0 )
                return NULL;
                                                                                 
+       attrs = anlist2charray( anlist, 1 );
+                                                                                
        n = i;
                                                                                 
        if ( k )
@@ -1026,9 +1033,8 @@ anlist2attrs( AttributeName * anlist )
        i = 0;
        while ( attrs && attrs[i] ) {
                if ( *attrs[i] == '@' ) {
+                       ch_free( attrs[i] );
                        for ( j = i; attrs[j]; j++ ) {
-                               if ( j == i )
-                                       ch_free( attrs[i] );
                                attrs[j] = attrs[j+1];
                        }
                } else {
@@ -1040,9 +1046,8 @@ anlist2attrs( AttributeName * anlist )
                j = i + 1;
                while ( attrs && attrs[j] ) {
                        if ( !strcmp( attrs[i], attrs[j] )) {
+                               ch_free( attrs[j] );
                                for ( k = j; attrs && attrs[k]; k++ ) {
-                                       if ( k == j )
-                                               ch_free( attrs[j] );
                                        attrs[k] = attrs[k+1];
                                }
                        } else {
@@ -1176,6 +1181,15 @@ ad_define_option( const char *name, const char *fname, int lineno )
        return 0;
 }
 
+void
+ad_unparse_options( BerVarray *res )
+{
+       int i;
+       for ( i = 0; i < option_count; i++ ) {
+               value_add_one( res, &options[i].name );
+       }
+}
+
 /* Find the definition of the option name or prefix matching the arguments */
 static Attr_option *
 ad_find_option_definition( const char *opt, int optlen )