]> git.sur5r.net Git - openldap/blobdiff - libraries/libldap/options.c
ITS#6898 fix regression from ITS#6625
[openldap] / libraries / libldap / options.c
index fcf7cc7ca5da4d2b9e358dea15c576f1a2023f50..3d940972d6b6e7915ea5a8fd57ba8c449ca11b43 100644 (file)
@@ -1,7 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 
 #include "ldap-int.h"
 
+#define LDAP_OPT_REBIND_PROC 0x4e814d
+#define LDAP_OPT_REBIND_PARAMS 0x4e814e
+
+#define LDAP_OPT_NEXTREF_PROC 0x4e815d
+#define LDAP_OPT_NEXTREF_PARAMS 0x4e815e
+
+#define LDAP_OPT_URLLIST_PROC 0x4e816d
+#define LDAP_OPT_URLLIST_PARAMS 0x4e816e
+
 static const LDAPAPIFeatureInfo features[] = {
 #ifdef LDAP_API_FEATURE_X_OPENLDAP
        {       /* OpenLDAP Extensions API Feature */
@@ -61,13 +79,6 @@ static const LDAPAPIFeatureInfo features[] = {
                LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
        },
 #endif
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
-       {       /* DNS */
-               LDAP_FEATURE_INFO_VERSION,
-               "X_OPENLDAP_V2_DNS",
-               LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
-       },
-#endif
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
        {       /* V2 Referrals */
                LDAP_FEATURE_INFO_VERSION,
@@ -84,16 +95,20 @@ ldap_get_option(
        int             option,
        void    *outvalue)
 {
-       const struct ldapoptions *lo;
+       struct ldapoptions *lo;
+       int rc = LDAP_OPT_ERROR;
 
-       if( ldap_int_global_options.ldo_valid != LDAP_INITIALIZED ) {
-               ldap_int_initialize();
+       /* Get pointer to global option structure */
+       lo = LDAP_INT_GLOBAL_OPT();   
+       if (NULL == lo) {
+               return LDAP_NO_MEMORY;
        }
 
-       if(ld == NULL) {
-               lo = &ldap_int_global_options;
+       if( lo->ldo_valid != LDAP_INITIALIZED ) {
+               ldap_int_initialize(lo, NULL);
+       }
 
-       } else {
+       if(ld != NULL) {
                assert( LDAP_VALID( ld ) );
 
                if( !LDAP_VALID( ld ) ) {
@@ -108,22 +123,23 @@ ldap_get_option(
                return LDAP_OPT_ERROR;
        }
 
+       LDAP_MUTEX_LOCK( &lo->ldo_mutex );
+
        switch(option) {
        case LDAP_OPT_API_INFO: {
                        struct ldapapiinfo *info = (struct ldapapiinfo *) outvalue;
 
                        if(info == NULL) {
                                /* outvalue must point to an apiinfo structure */
-                               return LDAP_OPT_ERROR;
+                               break;  /* LDAP_OPT_ERROR */
                        }
 
                        if(info->ldapai_info_version != LDAP_API_INFO_VERSION) {
                                /* api info version mismatch */
                                info->ldapai_info_version = LDAP_API_INFO_VERSION;
-                               return LDAP_OPT_ERROR;
+                               break;  /* LDAP_OPT_ERROR */
                        }
 
-                       info->ldapai_api_version = LDAP_API_VERSION;
                        info->ldapai_api_version = LDAP_API_VERSION;
                        info->ldapai_protocol_version = LDAP_VERSION_MAX;
 
@@ -145,91 +161,138 @@ ldap_get_option(
                        info->ldapai_vendor_name = LDAP_STRDUP(LDAP_VENDOR_NAME);
                        info->ldapai_vendor_version = LDAP_VENDOR_VERSION;
 
-                       return LDAP_OPT_SUCCESS;
+                       rc = LDAP_OPT_SUCCESS;
+                       break;
                } break;
 
        case LDAP_OPT_DESC:
-               if(ld == NULL) {
+               if( ld == NULL || ld->ld_sb == NULL ) {
                        /* bad param */
                        break;
                } 
 
-               * (ber_socket_t *) outvalue = ber_pvt_sb_get_desc( &(ld->ld_sb) );
-               return LDAP_OPT_SUCCESS;
+               ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_GET_FD, outvalue );
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_SOCKBUF:
+               if( ld == NULL ) break;
+               *(Sockbuf **)outvalue = ld->ld_sb;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_TIMEOUT:
                /* the caller has to free outvalue ! */
-               if ( ldap_int_timeval_dup( outvalue, lo->ldo_tm_api) != 0 )
-               {
-                       return LDAP_OPT_ERROR;
+               if ( lo->ldo_tm_api.tv_sec < 0 ) {
+                       *(void **)outvalue = NULL;
+               } else if ( ldap_int_timeval_dup( outvalue, &lo->ldo_tm_api ) != 0 ) {
+                       break;  /* LDAP_OPT_ERROR */
                }
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
                
        case LDAP_OPT_NETWORK_TIMEOUT:
                /* the caller has to free outvalue ! */
-               if ( ldap_int_timeval_dup( outvalue, lo->ldo_tm_net ) != 0 )
-               {
-                       return LDAP_OPT_ERROR;
+               if ( lo->ldo_tm_net.tv_sec < 0 ) {
+                       *(void **)outvalue = NULL;
+               } else if ( ldap_int_timeval_dup( outvalue, &lo->ldo_tm_net ) != 0 ) {
+                       break;  /* LDAP_OPT_ERROR */
                }
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_DEREF:
                * (int *) outvalue = lo->ldo_deref;
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_SIZELIMIT:
                * (int *) outvalue = lo->ldo_sizelimit;
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_TIMELIMIT:
                * (int *) outvalue = lo->ldo_timelimit;
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_REFERRALS:
                * (int *) outvalue = (int) LDAP_BOOL_GET(lo, LDAP_BOOL_REFERRALS);
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
                
        case LDAP_OPT_RESTART:
                * (int *) outvalue = (int) LDAP_BOOL_GET(lo, LDAP_BOOL_RESTART);
-               return LDAP_OPT_SUCCESS;
-
-       case LDAP_OPT_DNS:      /* LDAPv2 */
-               * (int *) outvalue = (int) LDAP_BOOL_GET(lo, LDAP_BOOL_DNS);
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_PROTOCOL_VERSION:
                * (int *) outvalue = lo->ldo_version;
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_SERVER_CONTROLS:
                * (LDAPControl ***) outvalue =
                        ldap_controls_dup( lo->ldo_sctrls );
-
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_CLIENT_CONTROLS:
                * (LDAPControl ***) outvalue =
                        ldap_controls_dup( lo->ldo_cctrls );
-
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_HOST_NAME:
                * (char **) outvalue = ldap_url_list2hosts(lo->ldo_defludp);
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_URI:
                * (char **) outvalue = ldap_url_list2urls(lo->ldo_defludp);
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_DEFBASE:
+               if( lo->ldo_defbase == NULL ) {
+                       * (char **) outvalue = NULL;
+               } else {
+                       * (char **) outvalue = LDAP_STRDUP(lo->ldo_defbase);
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_CONNECT_ASYNC:
+               * (int *) outvalue = (int) LDAP_BOOL_GET(lo, LDAP_BOOL_CONNECT_ASYNC);
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_CONNECT_CB:
+               {
+                       /* Getting deletes the specified callback */
+                       ldaplist **ll = &lo->ldo_conn_cbs;
+                       for (;*ll;ll = &(*ll)->ll_next) {
+                               if ((*ll)->ll_data == outvalue) {
+                                       ldaplist *lc = *ll;
+                                       *ll = lc->ll_next;
+                                       LDAP_FREE(lc);
+                                       break;
+                               }
+                       }
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
-       case LDAP_OPT_ERROR_NUMBER:
+       case LDAP_OPT_RESULT_CODE:
                if(ld == NULL) {
                        /* bad param */
                        break;
                } 
                * (int *) outvalue = ld->ld_errno;
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
-       case LDAP_OPT_ERROR_STRING:
+       case LDAP_OPT_DIAGNOSTIC_MESSAGE:
                if(ld == NULL) {
                        /* bad param */
                        break;
@@ -240,8 +303,8 @@ ldap_get_option(
                } else {
                        * (char **) outvalue = LDAP_STRDUP(ld->ld_error);
                }
-
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_MATCHED_DN:
                if(ld == NULL) {
@@ -252,30 +315,47 @@ ldap_get_option(
                if( ld->ld_matched == NULL ) {
                        * (char **) outvalue = NULL;
                } else {
-                       * (char **) outvalue = LDAP_STRDUP(ld->ld_matched);
+                       * (char **) outvalue = LDAP_STRDUP( ld->ld_matched );
                }
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
-               return LDAP_OPT_SUCCESS;
+       case LDAP_OPT_REFERRAL_URLS:
+               if(ld == NULL) {
+                       /* bad param */
+                       break;
+               } 
+
+               if( ld->ld_referrals == NULL ) {
+                       * (char ***) outvalue = NULL;
+               } else {
+                       * (char ***) outvalue = ldap_value_dup(ld->ld_referrals);
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_API_FEATURE_INFO: {
                        LDAPAPIFeatureInfo *info = (LDAPAPIFeatureInfo *) outvalue;
                        int i;
 
-                       if(info == NULL) return LDAP_OPT_ERROR;
+                       if(info == NULL)
+                               break;  /* LDAP_OPT_ERROR */
 
                        if(info->ldapaif_info_version != LDAP_FEATURE_INFO_VERSION) {
                                /* api info version mismatch */
                                info->ldapaif_info_version = LDAP_FEATURE_INFO_VERSION;
-                               return LDAP_OPT_ERROR;
+                               break;  /* LDAP_OPT_ERROR */
                        }
 
-                       if(info->ldapaif_name == NULL) return LDAP_OPT_ERROR;
+                       if(info->ldapaif_name == NULL)
+                               break;  /* LDAP_OPT_ERROR */
 
                        for(i=0; features[i].ldapaif_name != NULL; i++) {
                                if(!strcmp(info->ldapaif_name, features[i].ldapaif_name)) {
                                        info->ldapaif_version =
                                                features[i].ldapaif_version;
-                                       return LDAP_OPT_SUCCESS;
+                                       rc = LDAP_OPT_SUCCESS;
+                                       break;
                                }
                        }
                }
@@ -283,22 +363,54 @@ ldap_get_option(
 
        case LDAP_OPT_DEBUG_LEVEL:
                * (int *) outvalue = lo->ldo_debug;
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+       
+       case LDAP_OPT_SESSION_REFCNT:
+               * (int *) outvalue = ld->ld_ldcrefcnt;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_X_KEEPALIVE_IDLE:
+               * (int *) outvalue = lo->ldo_keepalive_idle;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_X_KEEPALIVE_PROBES:
+               * (int *) outvalue = lo->ldo_keepalive_probes;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_X_KEEPALIVE_INTERVAL:
+               * (int *) outvalue = lo->ldo_keepalive_interval;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        default:
 #ifdef HAVE_TLS
-               if ( ldap_pvt_tls_get_option((struct ldapoptions *)lo, option, outvalue ) == 0 )
-                       return LDAP_OPT_SUCCESS;
+               if ( ldap_pvt_tls_get_option( ld, option, outvalue ) == 0 ) {
+                       rc = LDAP_OPT_SUCCESS;
+                       break;
+               }
 #endif
 #ifdef HAVE_CYRUS_SASL
-               if ( ldap_pvt_sasl_get_option(ld, option, outvalue ) == 0 )
-                       return LDAP_OPT_SUCCESS;
+               if ( ldap_int_sasl_get_option( ld, option, outvalue ) == 0 ) {
+                       rc = LDAP_OPT_SUCCESS;
+                       break;
+               }
+#endif
+#ifdef HAVE_GSSAPI
+               if ( ldap_int_gssapi_get_option( ld, option, outvalue ) == 0 ) {
+                       rc = LDAP_OPT_SUCCESS;
+                       break;
+               }
 #endif
                /* bad param */
                break;
        }
 
-       return LDAP_OPT_ERROR;
+       LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+       return ( rc );
 }
 
 int
@@ -308,15 +420,29 @@ ldap_set_option(
        LDAP_CONST void *invalue)
 {
        struct ldapoptions *lo;
+       int *dbglvl = NULL;
+       int rc = LDAP_OPT_ERROR;
 
-       if( ldap_int_global_options.ldo_valid != LDAP_INITIALIZED ) {
-               ldap_int_initialize();
+       /* Get pointer to global option structure */
+       lo = LDAP_INT_GLOBAL_OPT();
+       if (lo == NULL) {
+               return LDAP_NO_MEMORY;
        }
 
-       if(ld == NULL) {
-               lo = &ldap_int_global_options;
+       /*
+        * The architecture to turn on debugging has a chicken and egg
+        * problem. Thus, we introduce a fix here.
+        */
 
-       } else {
+       if (option == LDAP_OPT_DEBUG_LEVEL) {
+               dbglvl = (int *) invalue;
+       }
+
+       if( lo->ldo_valid != LDAP_INITIALIZED ) {
+               ldap_int_initialize(lo, dbglvl);
+       }
+
+       if(ld != NULL) {
                assert( LDAP_VALID( ld ) );
 
                if( !LDAP_VALID( ld ) ) {
@@ -326,14 +452,19 @@ ldap_set_option(
                lo = &ld->ld_options;
        }
 
-       switch(option) {
+       LDAP_MUTEX_LOCK( &lo->ldo_mutex );
+
+       switch ( option ) {
+
+       /* options with boolean values */
        case LDAP_OPT_REFERRALS:
                if(invalue == LDAP_OPT_OFF) {
                        LDAP_BOOL_CLR(lo, LDAP_BOOL_REFERRALS);
                } else {
                        LDAP_BOOL_SET(lo, LDAP_BOOL_REFERRALS);
                }
-               return LDAP_OPT_SUCCESS;
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_RESTART:
                if(invalue == LDAP_OPT_OFF) {
@@ -341,127 +472,83 @@ ldap_set_option(
                } else {
                        LDAP_BOOL_SET(lo, LDAP_BOOL_RESTART);
                }
-               return LDAP_OPT_SUCCESS;
-       }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_CONNECT_ASYNC:
+               if(invalue == LDAP_OPT_OFF) {
+                       LDAP_BOOL_CLR(lo, LDAP_BOOL_CONNECT_ASYNC);
+               } else {
+                       LDAP_BOOL_SET(lo, LDAP_BOOL_CONNECT_ASYNC);
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        /* options which can withstand invalue == NULL */
-       switch ( option ) {
        case LDAP_OPT_SERVER_CONTROLS: {
                        LDAPControl *const *controls =
                                (LDAPControl *const *) invalue;
 
-                       ldap_controls_free( lo->ldo_sctrls );
+                       if( lo->ldo_sctrls )
+                               ldap_controls_free( lo->ldo_sctrls );
 
                        if( controls == NULL || *controls == NULL ) {
                                lo->ldo_sctrls = NULL;
-                               return LDAP_OPT_SUCCESS;
+                               rc = LDAP_OPT_SUCCESS;
+                               break;
                        }
                                
                        lo->ldo_sctrls = ldap_controls_dup( controls );
 
                        if(lo->ldo_sctrls == NULL) {
                                /* memory allocation error ? */
-                               break;
+                               break;  /* LDAP_OPT_ERROR */
                        }
-               } return LDAP_OPT_SUCCESS;
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_CLIENT_CONTROLS: {
                        LDAPControl *const *controls =
                                (LDAPControl *const *) invalue;
 
-                       ldap_controls_free( lo->ldo_cctrls );
+                       if( lo->ldo_cctrls )
+                               ldap_controls_free( lo->ldo_cctrls );
 
                        if( controls == NULL || *controls == NULL ) {
                                lo->ldo_cctrls = NULL;
-                               return LDAP_OPT_SUCCESS;
+                               rc = LDAP_OPT_SUCCESS;
+                               break;
                        }
                                
                        lo->ldo_cctrls = ldap_controls_dup( controls );
 
                        if(lo->ldo_cctrls == NULL) {
                                /* memory allocation error ? */
-                               break;
-                       }
-               } return LDAP_OPT_SUCCESS;
-
-       case LDAP_OPT_TIMEOUT: {
-                       const struct timeval *tv = 
-                               (const struct timeval *) invalue;
-
-                       if ( lo->ldo_tm_api != NULL ) {
-                               LDAP_FREE( lo->ldo_tm_api );
-                               lo->ldo_tm_api = NULL;
-                       }
-
-                       if ( ldap_int_timeval_dup( &lo->ldo_tm_api, tv ) != 0 ) {
-                               return LDAP_OPT_ERROR;
-                       }
-               } return LDAP_OPT_SUCCESS;
-
-       case LDAP_OPT_NETWORK_TIMEOUT: {
-                       const struct timeval *tv = 
-                               (const struct timeval *) invalue;
-
-                       if ( lo->ldo_tm_net != NULL ) {
-                               LDAP_FREE( lo->ldo_tm_net );
-                               lo->ldo_tm_net = NULL;
+                               break;  /* LDAP_OPT_ERROR */
                        }
-
-                       if ( ldap_int_timeval_dup( &lo->ldo_tm_net, tv ) != 0 ) {
-                               return LDAP_OPT_ERROR;
-                       }
-               } return LDAP_OPT_SUCCESS;
-       }
-
-       if(invalue == NULL) {
-               /* no place to set from */
-               return LDAP_OPT_ERROR;
-       }
-
-       /* options which cannot withstand invalue == NULL */
-
-       switch(option) {
-       case LDAP_OPT_API_INFO:
-       case LDAP_OPT_DESC:
-               /* READ ONLY */
+               }
+               rc = LDAP_OPT_SUCCESS;
                break;
 
-       case LDAP_OPT_DEREF:
-               lo->ldo_deref = * (const int *) invalue;
-               return LDAP_OPT_SUCCESS;
-
-       case LDAP_OPT_SIZELIMIT:
-               lo->ldo_sizelimit = * (const int *) invalue;
-               return LDAP_OPT_SUCCESS;
-
-       case LDAP_OPT_TIMELIMIT:
-               lo->ldo_timelimit = * (const int *) invalue;
-               return LDAP_OPT_SUCCESS;
-
-       case LDAP_OPT_PROTOCOL_VERSION: {
-                       int vers = * (const int *) invalue;
-                       if (vers < LDAP_VERSION_MIN || vers > LDAP_VERSION_MAX) {
-                               /* not supported */
-                               break;
-                       }
-                       lo->ldo_version = vers;
-               } return LDAP_OPT_SUCCESS;
-
 
        case LDAP_OPT_HOST_NAME: {
                        const char *host = (const char *) invalue;
                        LDAPURLDesc *ludlist = NULL;
-                       int rc = LDAP_OPT_SUCCESS;
+                       rc = LDAP_OPT_SUCCESS;
 
                        if(host != NULL) {
-                               rc = ldap_url_parsehosts(&ludlist, host);
+                               rc = ldap_url_parsehosts( &ludlist, host,
+                                       lo->ldo_defport ? lo->ldo_defport : LDAP_PORT );
 
                        } else if(ld == NULL) {
                                /*
                                 * must want global default returned
                                 * to initial condition.
                                 */
-                               rc = ldap_url_parselist(&ludlist, "ldap://localhost/");
+                               rc = ldap_url_parselist_ext(&ludlist, "ldap://localhost/", NULL,
+                                       LDAP_PVT_URL_PARSE_NOEMPTY_HOST
+                                       | LDAP_PVT_URL_PARSE_DEF_PORT );
 
                        } else {
                                /*
@@ -479,23 +566,26 @@ ldap_set_option(
                                        ldap_free_urllist(lo->ldo_defludp);
                                lo->ldo_defludp = ludlist;
                        }
-                       return rc;
+                       break;
                }
 
        case LDAP_OPT_URI: {
                        const char *urls = (const char *) invalue;
                        LDAPURLDesc *ludlist = NULL;
-                       int rc = LDAP_OPT_SUCCESS;
+                       rc = LDAP_OPT_SUCCESS;
 
                        if(urls != NULL) {
-                               rc = ldap_url_parselist(&ludlist, urls);
-
+                               rc = ldap_url_parselist_ext(&ludlist, urls, NULL,
+                                       LDAP_PVT_URL_PARSE_NOEMPTY_HOST
+                                       | LDAP_PVT_URL_PARSE_DEF_PORT );
                        } else if(ld == NULL) {
                                /*
                                 * must want global default returned
                                 * to initial condition.
                                 */
-                               rc = ldap_url_parselist(&ludlist, "ldap://localhost/");
+                               rc = ldap_url_parselist_ext(&ludlist, "ldap://localhost/", NULL,
+                                       LDAP_PVT_URL_PARSE_NOEMPTY_HOST
+                                       | LDAP_PVT_URL_PARSE_DEF_PORT );
 
                        } else {
                                /*
@@ -505,77 +595,336 @@ ldap_set_option(
                                ludlist = ldap_url_duplist(
                                        ldap_int_global_options.ldo_defludp);
                                if (ludlist == NULL)
-                                       rc = LDAP_NO_MEMORY;
+                                       rc = LDAP_URL_ERR_MEM;
                        }
 
-                       if (rc == LDAP_OPT_SUCCESS) {
+                       switch (rc) {
+                       case LDAP_URL_SUCCESS:          /* Success */
+                               rc = LDAP_SUCCESS;
+                               break;
+
+                       case LDAP_URL_ERR_MEM:          /* can't allocate memory space */
+                               rc = LDAP_NO_MEMORY;
+                               break;
+
+                       case LDAP_URL_ERR_PARAM:        /* parameter is bad */
+                       case LDAP_URL_ERR_BADSCHEME:    /* URL doesn't begin with "ldap[si]://" */
+                       case LDAP_URL_ERR_BADENCLOSURE: /* URL is missing trailing ">" */
+                       case LDAP_URL_ERR_BADURL:       /* URL is bad */
+                       case LDAP_URL_ERR_BADHOST:      /* host port is bad */
+                       case LDAP_URL_ERR_BADATTRS:     /* bad (or missing) attributes */
+                       case LDAP_URL_ERR_BADSCOPE:     /* scope string is invalid (or missing) */
+                       case LDAP_URL_ERR_BADFILTER:    /* bad or missing filter */
+                       case LDAP_URL_ERR_BADEXTS:      /* bad or missing extensions */
+                               rc = LDAP_PARAM_ERROR;
+                               break;
+                       }
+
+                       if (rc == LDAP_SUCCESS) {
                                if (lo->ldo_defludp != NULL)
                                        ldap_free_urllist(lo->ldo_defludp);
                                lo->ldo_defludp = ludlist;
                        }
-                       return rc;
+                       break;
                }
 
-       case LDAP_OPT_ERROR_NUMBER: {
-                       int err = * (const int *) invalue;
+       case LDAP_OPT_DEFBASE: {
+                       const char *newbase = (const char *) invalue;
+                       char *defbase = NULL;
 
-                       if(ld == NULL) {
-                               /* need a struct ldap */
-                               break;
-                       }
+                       if ( newbase != NULL ) {
+                               defbase = LDAP_STRDUP( newbase );
+                               if ( defbase == NULL ) {
+                                       rc = LDAP_NO_MEMORY;
+                                       break;
+                               }
 
-                       ld->ld_errno = err;
-               } return LDAP_OPT_SUCCESS;
+                       } else if ( ld != NULL ) {
+                               defbase = LDAP_STRDUP( ldap_int_global_options.ldo_defbase );
+                               if ( defbase == NULL ) {
+                                       rc = LDAP_NO_MEMORY;
+                                       break;
+                               }
+                       }
+                       
+                       if ( lo->ldo_defbase != NULL )
+                               LDAP_FREE( lo->ldo_defbase );
+                       lo->ldo_defbase = defbase;
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
-       case LDAP_OPT_ERROR_STRING: {
+       case LDAP_OPT_DIAGNOSTIC_MESSAGE: {
                        const char *err = (const char *) invalue;
 
                        if(ld == NULL) {
                                /* need a struct ldap */
-                               break;
+                               break;  /* LDAP_OPT_ERROR */
                        }
 
                        if( ld->ld_error ) {
                                LDAP_FREE(ld->ld_error);
+                               ld->ld_error = NULL;
                        }
 
-                       ld->ld_error = LDAP_STRDUP(err);
-               } return LDAP_OPT_SUCCESS;
+                       if ( err ) {
+                               ld->ld_error = LDAP_STRDUP(err);
+                       }
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
        case LDAP_OPT_MATCHED_DN: {
-                       const char *err = (const char *) invalue;
+                       const char *matched = (const char *) invalue;
 
-                       if(ld == NULL) {
+                       if (ld == NULL) {
                                /* need a struct ldap */
-                               break;
+                               break;  /* LDAP_OPT_ERROR */
                        }
 
                        if( ld->ld_matched ) {
                                LDAP_FREE(ld->ld_matched);
+                               ld->ld_matched = NULL;
+                       }
+
+                       if ( matched ) {
+                               ld->ld_matched = LDAP_STRDUP( matched );
                        }
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
 
-                       ld->ld_matched = LDAP_STRDUP(err);
-               } return LDAP_OPT_SUCCESS;
+       case LDAP_OPT_REFERRAL_URLS: {
+                       char *const *referrals = (char *const *) invalue;
+                       
+                       if(ld == NULL) {
+                               /* need a struct ldap */
+                               break;  /* LDAP_OPT_ERROR */
+                       }
 
-       case LDAP_OPT_API_FEATURE_INFO:
-               /* read-only */
+                       if( ld->ld_referrals ) {
+                               LDAP_VFREE(ld->ld_referrals);
+                       }
+
+                       if ( referrals ) {
+                               ld->ld_referrals = ldap_value_dup(referrals);
+                       }
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       /* Only accessed from inside this function by ldap_set_rebind_proc() */
+       case LDAP_OPT_REBIND_PROC: {
+                       lo->ldo_rebind_proc = (LDAP_REBIND_PROC *)invalue;              
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+       case LDAP_OPT_REBIND_PARAMS: {
+                       lo->ldo_rebind_params = (void *)invalue;                
+               }
+               rc = LDAP_OPT_SUCCESS;
                break;
 
+       /* Only accessed from inside this function by ldap_set_nextref_proc() */
+       case LDAP_OPT_NEXTREF_PROC: {
+                       lo->ldo_nextref_proc = (LDAP_NEXTREF_PROC *)invalue;            
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+       case LDAP_OPT_NEXTREF_PARAMS: {
+                       lo->ldo_nextref_params = (void *)invalue;               
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       /* Only accessed from inside this function by ldap_set_urllist_proc() */
+       case LDAP_OPT_URLLIST_PROC: {
+                       lo->ldo_urllist_proc = (LDAP_URLLIST_PROC *)invalue;            
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+       case LDAP_OPT_URLLIST_PARAMS: {
+                       lo->ldo_urllist_params = (void *)invalue;               
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       /* read-only options */
+       case LDAP_OPT_API_INFO:
+       case LDAP_OPT_DESC:
+       case LDAP_OPT_SOCKBUF:
+       case LDAP_OPT_API_FEATURE_INFO:
+               break;  /* LDAP_OPT_ERROR */
+
+       /* options which cannot withstand invalue == NULL */
+       case LDAP_OPT_DEREF:
+       case LDAP_OPT_SIZELIMIT:
+       case LDAP_OPT_TIMELIMIT:
+       case LDAP_OPT_PROTOCOL_VERSION:
+       case LDAP_OPT_RESULT_CODE:
        case LDAP_OPT_DEBUG_LEVEL:
-               lo->ldo_debug = * (const int *) invalue;
-               return LDAP_OPT_SUCCESS;
+       case LDAP_OPT_TIMEOUT:
+       case LDAP_OPT_NETWORK_TIMEOUT:
+       case LDAP_OPT_CONNECT_CB:
+       case LDAP_OPT_X_KEEPALIVE_IDLE:
+       case LDAP_OPT_X_KEEPALIVE_PROBES :
+       case LDAP_OPT_X_KEEPALIVE_INTERVAL :
+               if(invalue == NULL) {
+                       /* no place to set from */
+                       LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+                       return ( LDAP_OPT_ERROR );
+               }
+               break;
 
        default:
 #ifdef HAVE_TLS
-               if ( ldap_pvt_tls_set_option( lo, option, (void *)invalue ) == 0 )
-                       return LDAP_OPT_SUCCESS;
+               if ( ldap_pvt_tls_set_option( ld, option, (void *)invalue ) == 0 ) {
+                       LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+                       return ( LDAP_OPT_SUCCESS );
+               }
 #endif
 #ifdef HAVE_CYRUS_SASL
-               if ( ldap_pvt_sasl_set_option( ld, option, (void *)invalue ) == 0 )
-                       return LDAP_OPT_SUCCESS;
+               if ( ldap_int_sasl_set_option( ld, option, (void *)invalue ) == 0 ) {
+                       LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+                       return ( LDAP_OPT_SUCCESS );
+               }
+#endif
+#ifdef HAVE_GSSAPI
+               if ( ldap_int_gssapi_set_option( ld, option, (void *)invalue ) == 0 ) {
+                       LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+                       return ( LDAP_OPT_SUCCESS );
+               }
 #endif
                /* bad param */
+               break;  /* LDAP_OPT_ERROR */
+       }
+
+       /* options which cannot withstand invalue == NULL */
+
+       switch(option) {
+       case LDAP_OPT_DEREF:
+               /* FIXME: check value for protocol compliance? */
+               lo->ldo_deref = * (const int *) invalue;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_SIZELIMIT:
+               /* FIXME: check value for protocol compliance? */
+               lo->ldo_sizelimit = * (const int *) invalue;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_TIMELIMIT:
+               /* FIXME: check value for protocol compliance? */
+               lo->ldo_timelimit = * (const int *) invalue;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_TIMEOUT: {
+                       const struct timeval *tv = 
+                               (const struct timeval *) invalue;
+
+                       lo->ldo_tm_api = *tv;
+               }
+               rc = LDAP_OPT_SUCCESS;
                break;
+
+       case LDAP_OPT_NETWORK_TIMEOUT: {
+                       const struct timeval *tv = 
+                               (const struct timeval *) invalue;
+
+                       lo->ldo_tm_net = *tv;
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_PROTOCOL_VERSION: {
+                       int vers = * (const int *) invalue;
+                       if (vers < LDAP_VERSION_MIN || vers > LDAP_VERSION_MAX) {
+                               /* not supported */
+                               break;
+                       }
+                       lo->ldo_version = vers;
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_RESULT_CODE: {
+                       int err = * (const int *) invalue;
+
+                       if(ld == NULL) {
+                               /* need a struct ldap */
+                               break;
+                       }
+
+                       ld->ld_errno = err;
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_DEBUG_LEVEL:
+               lo->ldo_debug = * (const int *) invalue;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+
+       case LDAP_OPT_CONNECT_CB:
+               {
+                       /* setting pushes the callback */
+                       ldaplist *ll;
+                       ll = LDAP_MALLOC( sizeof( *ll ));
+                       ll->ll_data = (void *)invalue;
+                       ll->ll_next = lo->ldo_conn_cbs;
+                       lo->ldo_conn_cbs = ll;
+               }
+               rc = LDAP_OPT_SUCCESS;
+               break;
+       case LDAP_OPT_X_KEEPALIVE_IDLE:
+               lo->ldo_keepalive_idle = * (const int *) invalue;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+       case LDAP_OPT_X_KEEPALIVE_PROBES :
+               lo->ldo_keepalive_probes = * (const int *) invalue;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+       case LDAP_OPT_X_KEEPALIVE_INTERVAL :
+               lo->ldo_keepalive_interval = * (const int *) invalue;
+               rc = LDAP_OPT_SUCCESS;
+               break;
+       
        }
-       return LDAP_OPT_ERROR;
+       LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+       return ( rc );
+}
+
+int
+ldap_set_rebind_proc( LDAP *ld, LDAP_REBIND_PROC *proc, void *params )
+{
+       int rc;
+       rc = ldap_set_option( ld, LDAP_OPT_REBIND_PROC, (void *)proc );
+       if( rc != LDAP_OPT_SUCCESS ) return rc;
+
+       rc = ldap_set_option( ld, LDAP_OPT_REBIND_PARAMS, (void *)params );
+       return rc;
+}
+
+int
+ldap_set_nextref_proc( LDAP *ld, LDAP_NEXTREF_PROC *proc, void *params )
+{
+       int rc;
+       rc = ldap_set_option( ld, LDAP_OPT_NEXTREF_PROC, (void *)proc );
+       if( rc != LDAP_OPT_SUCCESS ) return rc;
+
+       rc = ldap_set_option( ld, LDAP_OPT_NEXTREF_PARAMS, (void *)params );
+       return rc;
+}
+
+int
+ldap_set_urllist_proc( LDAP *ld, LDAP_URLLIST_PROC *proc, void *params )
+{
+       int rc;
+       rc = ldap_set_option( ld, LDAP_OPT_URLLIST_PROC, (void *)proc );
+       if( rc != LDAP_OPT_SUCCESS ) return rc;
+
+       rc = ldap_set_option( ld, LDAP_OPT_URLLIST_PARAMS, (void *)params );
+       return rc;
 }