Fix slapd unsupported non-criticial control handling

diff --git a/CHANGES b/CHANGES
index a449bc951a06d57b1fcd51bc7698b23b86fdb87b..39b2aa47881fc82045bf1e1b9866450bb7838ad1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.1 Change Log
 
 OpenLDAP 2.1.6 Engineering
+       Fixed slapd unsupported non-criticial control handling
        Updated libldap_r Pth support (ITS#724) (ITS#1033)
        Updated slapd adlist support
        Build Environment

diff --git a/libraries/libldap/charray.c b/libraries/libldap/charray.c
new file mode 100644 (file)
index 0000000..d29c5d5
--- /dev/null
+++ b/libraries/libldap/charray.c
@@ -0,0 +1,266 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* charray.c - routines for dealing with char * arrays */
+
+#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
+#include "ldap-int.h"
+
+int
+ldap_charray_add(
+    char       ***a,
+    char       *s
+)
+{
+       int     n;
+
+       if ( *a == NULL ) {
+               *a = (char **) LDAP_MALLOC( 2 * sizeof(char *) );
+               n = 0;
+
+               if( *a == NULL ) {
+                       return -1;
+               }
+
+       } else {
+               char **new;
+
+               for ( n = 0; *a != NULL && (*a)[n] != NULL; n++ ) {
+                       ;       /* NULL */
+               }
+
+               new = (char **) LDAP_REALLOC( (char *) *a,
+                   (n + 2) * sizeof(char *) );
+
+               if( new == NULL ) {
+                       /* caller is required to call ldap_charray_free(*a) */
+                       return -1;
+               }
+
+               *a = new;
+       }
+
+       (*a)[n] = LDAP_STRDUP(s);
+
+       if( (*a)[n] == NULL ) {
+               return 1;
+       }
+
+       (*a)[++n] = NULL;
+
+       return 0;
+}
+
+int
+ldap_charray_merge(
+    char       ***a,
+    char       **s
+)
+{
+       int     i, n, nn;
+       char **aa;
+
+       for ( n = 0; *a != NULL && (*a)[n] != NULL; n++ ) {
+               ;       /* NULL */
+       }
+       for ( nn = 0; s[nn] != NULL; nn++ ) {
+               ;       /* NULL */
+       }
+
+       aa = (char **) LDAP_REALLOC( (char *) *a, (n + nn + 1) * sizeof(char *) );
+
+       if( aa == NULL ) {
+               return -1;
+       }
+
+       *a = aa;
+
+       for ( i = 0; i < nn; i++ ) {
+               (*a)[n + i] = LDAP_STRDUP(s[i]);
+
+               if( (*a)[n + i] == NULL ) {
+                       for( --i ; i >= 0 ; i-- ) {
+                               LDAP_FREE( (*a)[n + i] );
+                               (*a)[n + i] = NULL;
+                       }
+                       return -1;
+               }
+       }
+
+       (*a)[n + nn] = NULL;
+       return 0;
+}
+
+void
+ldap_charray_free( char **a )
+{
+       char    **p;
+
+       if ( a == NULL ) {
+               return;
+       }
+
+       for ( p = a; *p != NULL; p++ ) {
+               if ( *p != NULL ) {
+                       LDAP_FREE( *p );
+               }
+       }
+
+       LDAP_FREE( (char *) a );
+}
+
+int
+ldap_charray_inlist(
+    char       **a,
+    char       *s
+)
+{
+       int     i;
+
+       if( a == NULL ) return 0;
+
+       for ( i=0; a[i] != NULL; i++ ) {
+               if ( strcasecmp( s, a[i] ) == 0 ) {
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+
+char **
+ldap_charray_dup( char **a )
+{
+       int     i;
+       char    **new;
+
+       for ( i = 0; a[i] != NULL; i++ )
+               ;       /* NULL */
+
+       new = (char **) LDAP_MALLOC( (i + 1) * sizeof(char *) );
+
+       if( new == NULL ) {
+               return NULL;
+       }
+
+       for ( i = 0; a[i] != NULL; i++ ) {
+               new[i] = LDAP_STRDUP( a[i] );
+
+               if( new[i] == NULL ) {
+                       for( --i ; i >= 0 ; i-- ) {
+                               LDAP_FREE( new[i] );
+                       }
+                       LDAP_FREE( new );
+                       return NULL;
+               }
+       }
+       new[i] = NULL;
+
+       return( new );
+}
+
+char **
+ldap_str2charray( const char *str_in, const char *brkstr )
+{
+       char    **res;
+       char    *str, *s;
+       char    *lasts;
+       int     i;
+
+       /* protect the input string from strtok */
+       str = LDAP_STRDUP( str_in );
+       if( str == NULL ) {
+               return NULL;
+       }
+
+       i = 1;
+       for ( s = str; *s; s++ ) {
+               if ( ldap_utf8_strchr( brkstr, s ) != NULL ) {
+                       i++;
+               }
+       }
+
+       res = (char **) LDAP_MALLOC( (i + 1) * sizeof(char *) );
+
+       if( res == NULL ) {
+               LDAP_FREE( str );
+               return NULL;
+       }
+
+       i = 0;
+
+       for ( s = ldap_utf8_strtok( str, brkstr, &lasts );
+               s != NULL;
+               s = ldap_utf8_strtok( NULL, brkstr, &lasts ) )
+       {
+               res[i] = LDAP_STRDUP( s );
+
+               if(res[i] == NULL) {
+                       for( --i ; i >= 0 ; i-- ) {
+                               LDAP_FREE( res[i] );
+                       }
+                       LDAP_FREE( res );
+                       LDAP_FREE( str );
+                       return NULL;
+               }
+
+               i++;
+       }
+
+       res[i] = NULL;
+
+       LDAP_FREE( str );
+       return( res );
+}
+
+char * ldap_charray2str( char **a, const char *sep )
+{
+       char *s, **v, *p;
+       int len;
+       int slen;
+
+       if( sep == NULL ) sep = " ";
+
+       slen = strlen( sep );
+       len = 0;
+
+       for ( v = a; *v != NULL; v++ ) {
+               len += strlen( *v ) + slen;
+       }
+
+       if ( len == 0 ) {
+               return NULL;
+       }
+
+       /* trim extra sep len */
+       len -= slen;
+
+       s = LDAP_MALLOC ( len + 1 );
+
+       if ( s == NULL ) {
+               return NULL;    
+       }
+
+       p = s;
+       for ( v = a; *v != NULL; v++ ) {
+               if ( v != a ) {
+                       strncpy( p, sep, slen );
+                       p += slen;
+               }
+
+               len = strlen( *v );
+               strncpy( p, *v, len );
+               p += len;
+       }
+
+       *p = '\0';
+       return s;
+}

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 987eb8832c67d62f7126888403fc0df32a47f4b0..b5405dd3513fa8abc60b74372d3563ff58765a2b 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -736,16 +736,9 @@ backend_check_controls(
        Operation *op,
        const char **text )
 {
-       LDAPControl **ctrls;
-       ctrls = op->o_ctrls;
-       if( ctrls == NULL ) {
-               return LDAP_SUCCESS;
-       }
+       LDAPControl **ctrls = op->o_ctrls;
 
-       if ( be->be_controls == NULL ) {
-               *text = "control unavailable in context";
-               return LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
-       }
+       if( ctrls == NULL ) return LDAP_SUCCESS;
 
        for( ; *ctrls != NULL ; ctrls++ ) {
                if( (*ctrls)->ldctl_iscritical &&