Add LDAP URL critical extension counter support. lud_crit_exts

is the number of critical extensions contained in lud_exts.
As we currently do not support any extension, this flag is
useful for determining whether or not we should attempt to
use the URL.  Added check of this counter to ldap_url_search
and LDAPv3 chase referrals.

diff --git a/include/ldap.h b/include/ldap.h
index 4aa439fc757045e740646736bf340a080359c029..4b77324e557388e0d6be61a661519807b305b51b 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -520,6 +520,7 @@ typedef struct ldap_url_desc {
     int                lud_scope;
     char       *lud_filter;
     char       **lud_exts;
+       int             lud_crit_exts;
 } LDAPURLDesc;
 
 #define LDAP_URL_SUCCESS               0x00    /* Success */

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 1def978bf548b57e00dbbedb70a15a51297c1b8f..d174308191c5416df3ff65a15d0faab9d6d6d342 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -634,6 +634,13 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
                        goto done;
                }
 
+               if( srv->lud_crit_exts ) {
+                       /* we do not support any extensions */
+                       ld->ld_errno = LDAP_NOT_SUPPORTED;
+                       rc = -1;
+                       goto done;
+               }
+
                /* treat ldap://hostpart and ldap://hostpart/ the same */
                if ( srv->lud_dn && srv->lud_dn[0] == '\0' ) {
                        LDAP_FREE( srv->lud_dn );

diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index 8da394051d3f8cc65d2277658c4d5d904f1ea93b..cac3d31ed44146df323795d1f0ebea2879cb62f2 100644 (file)
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -277,6 +277,7 @@ ldap_url_parse( LDAP_CONST char *url_in, LDAPURLDesc **ludpp )
        ludp->lud_filter = NULL;
        ludp->lud_scope = LDAP_SCOPE_BASE;
        ludp->lud_filter = NULL;
+       ludp->lud_exts = NULL;
 
        ludp->lud_scheme = LDAP_STRDUP( scheme );
 
@@ -516,6 +517,11 @@ ldap_url_parse( LDAP_CONST char *url_in, LDAPURLDesc **ludpp )
 
        for( i=0; ludp->lud_exts[i] != NULL; i++ ) {
                ldap_pvt_hex_unescape( ludp->lud_exts[i] );
+
+               if( *ludp->lud_exts[i] == '!' ) {
+                       /* count the number of critical extensions */
+                       ludp->lud_crit_exts++;
+               }
        }
 
        if( i == 0 ) {
@@ -885,6 +891,12 @@ ldap_url_search( LDAP *ld, LDAP_CONST char *url, int attrsonly )
                return( -1 );
        }
 
+       if( ludp->lud_crit_exts ) {
+               /* we don't support any extension (yet) */
+               ld->ld_errno = LDAP_NOT_SUPPORTED;
+               return( -1 );
+       }
+
        ber = ldap_build_search_req( ld, ludp->lud_dn, ludp->lud_scope,
            ludp->lud_filter, ludp->lud_attrs, attrsonly, NULL, NULL,
                -1, -1 );