]> git.sur5r.net Git - openldap/blobdiff - libraries/libldap/options.c
Fix typo in previous commit.
[openldap] / libraries / libldap / options.c
index 2ac502bd84d33b5cf4930d6c6a833eb92b4e59eb..0d0400a6b65d6331891b8fb9a4a7e965835dcbaf 100644 (file)
@@ -1,3 +1,8 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
 #include "portable.h"
 
 #include <stdio.h>
 
 #include "ldap-int.h"
 
+static const LDAPAPIFeatureInfo features[] = {
+#ifdef LDAP_API_FEATURE_INFO
+       {"INFO", LDAP_API_FEATURE_INFO},
+#endif
+#ifdef LDAP_API_FEATURE_THREAD_SAFE
+       {"THREAD_SAFE", LDAP_API_FEATURE_THREAD_SAFE},
+#endif
+#ifdef LDAP_API_FEATURE_SESSION_THREAD_SAFE
+       {"SESSION_THREAD_SAFE", LDAP_API_FEATURE_SESSION_THREAD_SAFE},
+#endif
+#ifdef LDAP_API_FEATURE_OPERATION_THREAD_SAFE
+       {"OPERATION_THREAD_SAFE", LDAP_API_FEATURE_OPERATION_THREAD_SAFE},
+#endif
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_REEENTRANT
+       {"X_OPENLDAP_REENTRANT", LDAP_API_FEATURE_X_OPENLDAP_REENTRANT},
+#endif
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE ) && \
+       defined( LDAP_THREAD_SAFE )
+       {"X_OPENLDAP_THREAD_SAFE", LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE},
+#endif
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
+       {"X_OPENLDAP_V2_DNS", LDAP_API_FEATURE_X_OPENLDAP_V2_DNS},
+#endif
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+       {"X_OPENLDAP_V2_REFERRALS", LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS},
+#endif
+       {NULL, 0}
+};
+
 int
 ldap_get_option(
-       LDAP    *ldp,
+       LDAP    *ld,
        int             option,
        void    *outvalue)
 {
-       LDAP *ld;
+       struct ldapoptions *lo;
 
        if(!openldap_ldap_initialized) {
                openldap_ldap_initialize();
@@ -25,10 +59,10 @@ ldap_get_option(
                return -1;
        }
 
-       if(ldp == NULL) {
-               ld = &openldap_ld_globals;
+       if(ld == NULL) {
+               lo = &openldap_ldap_global_options;
        } else {
-               ld = ldp;
+               lo = &ld->ld_options;
        }
 
        switch(option) {
@@ -40,22 +74,39 @@ ldap_get_option(
                                return -1;
                        }
 
-                       if(info->ldapai_info_version != 1) {
-                               /* version mismatch */
+                       if(info->ldapai_info_version != LDAP_API_INFO_VERSION) {
+                               /* api info version mismatch */
+                               info->ldapai_info_version = LDAP_API_INFO_VERSION;
                                return -1;
                        }
 
+                       info->ldapai_api_version = LDAP_API_VERSION;
                        info->ldapai_api_version = LDAP_API_VERSION;
                        info->ldapai_protocol_version = LDAP_VERSION_MAX;
-                       info->ldapai_extensions = NULL;
-                       info->ldapai_vendor_name = strdup(LDAP_VENDOR);
+
+                       if(features[0].ldapaif_name == NULL) {
+                               info->ldapai_extensions = NULL;
+                       } else {
+                               int i;
+                               info->ldapai_extensions = malloc(sizeof(char *) *
+                                       sizeof(features)/sizeof(LDAPAPIFeatureInfo));
+
+                               for(i=0; features[i].ldapaif_name != NULL; i++) {
+                                       info->ldapai_extensions[i] =
+                                               strdup(features[i].ldapaif_name);
+                               }
+
+                               info->ldapai_extensions[i] = NULL;
+                       }
+
+                       info->ldapai_vendor_name = strdup(LDAP_VENDOR_NAME);
                        info->ldapai_vendor_version = LDAP_VENDOR_VERSION;
 
                        return 0;
                } break;
 
        case LDAP_OPT_DESC:
-               if(ldp == NULL) {
+               if(ld == NULL) {
                        /* bad param */
                        break;
                } 
@@ -64,50 +115,107 @@ ldap_get_option(
                return 0;
 
        case LDAP_OPT_DEREF:
-               * (int *) outvalue = ld->ld_deref;
+               * (int *) outvalue = lo->ldo_deref;
                return 0;
 
        case LDAP_OPT_SIZELIMIT:
-               * (int *) outvalue = ld->ld_sizelimit;
+               * (int *) outvalue = lo->ldo_sizelimit;
                return 0;
 
        case LDAP_OPT_TIMELIMIT:
-               * (int *) outvalue = ld->ld_timelimit;
+               * (int *) outvalue = lo->ldo_timelimit;
                return 0;
 
        case LDAP_OPT_REFERRALS:
-               * (int *) outvalue = (int) LDAP_BOOL_GET(ld, LDAP_BOOL_REFERRALS);
+               * (int *) outvalue = (int) LDAP_BOOL_GET(lo, LDAP_BOOL_REFERRALS);
                return 0;
                
        case LDAP_OPT_RESTART:
-               * (int *) outvalue = (int) LDAP_BOOL_GET(ld, LDAP_BOOL_RESTART);
+               * (int *) outvalue = (int) LDAP_BOOL_GET(lo, LDAP_BOOL_RESTART);
                return 0;
 
        case LDAP_OPT_DNS:      /* LDAPv2 */
-               * (int *) outvalue = (int) LDAP_BOOL_GET(ld, LDAP_BOOL_DNS);
+               * (int *) outvalue = (int) LDAP_BOOL_GET(lo, LDAP_BOOL_DNS);
                return 0;
 
        case LDAP_OPT_PROTOCOL_VERSION:
-               * (int *) outvalue = ld->ld_version;
+               if ((ld != NULL) && ld->ld_version) {
+                       * (int *) outvalue = ld->ld_version;
+               } else { 
+                       * (int *) outvalue = lo->ldo_version;
+               }
                return 0;
 
        case LDAP_OPT_SERVER_CONTROLS:
+               * (LDAPControl ***) outvalue =
+                       ldap_controls_dup( lo->ldo_server_controls );
+
+               return 0;
+
        case LDAP_OPT_CLIENT_CONTROLS:
-               /* not yet supported */
-               break;
+               * (LDAPControl ***) outvalue =
+                       ldap_controls_dup( lo->ldo_client_controls );
+
+               return 0;
 
        case LDAP_OPT_HOST_NAME:
-               * (char **) outvalue = ld->ld_host;
+               /*
+                * draft-ietf-ldapext-ldap-c-api-01 doesn't state
+                * whether caller has to free host names or not,
+                * we do.
+                */
+
+               * (char **) outvalue = strdup(lo->ldo_defhost);
                return 0;
 
        case LDAP_OPT_ERROR_NUMBER:
+               if(ld == NULL) {
+                       /* bad param */
+                       break;
+               } 
                * (int *) outvalue = ld->ld_errno;
                return 0;
 
        case LDAP_OPT_ERROR_STRING:
-               /* not yet supported */
+               if(ld == NULL) {
+                       /* bad param */
+                       break;
+               } 
+
+               /*
+                * draft-ietf-ldapext-ldap-c-api-01 doesn't require
+                *      the client to have to free error strings, we do
+                */
+
+               if( ld->ld_error == NULL ) {
+                       * (char **) outvalue = NULL;
+               } else {
+                       * (char **) outvalue = strdup(ld->ld_error);
+               }
+
+               return 0;
+
+       case LDAP_OPT_API_FEATURE_INFO: {
+                       LDAPAPIFeatureInfo *info = (LDAPAPIFeatureInfo *) outvalue;
+                       int i;
+
+                       if(info == NULL) return -1;
+                       if(info->ldapaif_name == NULL) return -1;
+
+                       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 0;
+                               }
+                       }
+               }
                break;
 
+       case LDAP_OPT_DEBUG_LEVEL:
+               * (int *) outvalue = lo->ldo_debug;
+               return 0;
+
        default:
                /* bad param */
                break;
@@ -118,11 +226,11 @@ ldap_get_option(
 
 int
 ldap_set_option(
-       LDAP    *ldp,
+       LDAP    *ld,
        int             option,
        void    *invalue)
 {
-       LDAP *ld;
+       struct ldapoptions *lo;
 
        if(!openldap_ldap_initialized) {
                openldap_ldap_initialize();
@@ -133,10 +241,10 @@ ldap_set_option(
                return -1;
        }
 
-       if(ldp == NULL) {
-               ld = &openldap_ld_globals;
+       if(ld == NULL) {
+               lo = &openldap_ldap_global_options;
        } else {
-               ld = ldp;
+               lo = &ld->ld_options;
        }
 
        switch(option) {
@@ -146,49 +254,144 @@ ldap_set_option(
                break;
 
        case LDAP_OPT_DEREF:
-               ld->ld_deref = * (int *) invalue;
+               lo->ldo_deref = * (int *) invalue;
                return 0;
 
        case LDAP_OPT_SIZELIMIT:
-               ld->ld_sizelimit = * (int *) invalue;
+               lo->ldo_sizelimit = * (int *) invalue;
                return 0;
 
        case LDAP_OPT_TIMELIMIT:
-               ld->ld_timelimit = * (int *) invalue;
+               lo->ldo_timelimit = * (int *) invalue;
                return 0;
 
        case LDAP_OPT_REFERRALS:
                if((int) invalue == (int) LDAP_OPT_ON) {
-                       LDAP_BOOL_SET(ld, LDAP_BOOL_REFERRALS);
+                       LDAP_BOOL_SET(lo, LDAP_BOOL_REFERRALS);
                } else {
-                       LDAP_BOOL_CLR(ld, LDAP_BOOL_REFERRALS);
+                       LDAP_BOOL_CLR(lo, LDAP_BOOL_REFERRALS);
                }
                return 0;
 
        case LDAP_OPT_RESTART:
                if((int) invalue == (int) LDAP_OPT_ON) {
-                       LDAP_BOOL_SET(ld, LDAP_BOOL_RESTART);
+                       LDAP_BOOL_SET(lo, LDAP_BOOL_RESTART);
                } else {
-                       LDAP_BOOL_CLR(ld, LDAP_BOOL_RESTART);
+                       LDAP_BOOL_CLR(lo, LDAP_BOOL_RESTART);
                }
                return 0;
 
        case LDAP_OPT_PROTOCOL_VERSION: {
                        int vers = * (int *) invalue;
-                       if (vers > LDAP_VERSION_MAX) {
+                       if (vers < LDAP_VERSION_MIN || vers > LDAP_VERSION_MAX) {
                                /* not supported */
                                break;
                        }
                        ld->ld_version = vers;
                } return 0;
 
-       case LDAP_OPT_SERVER_CONTROLS:
-       case LDAP_OPT_CLIENT_CONTROLS:
-       case LDAP_OPT_HOST_NAME:
-       case LDAP_OPT_ERROR_NUMBER:
-       case LDAP_OPT_ERROR_STRING:
-               /* not yet supported */
+       case LDAP_OPT_SERVER_CONTROLS: {
+                       LDAPControl **controls = (LDAPControl **) invalue;
+
+                       ldap_controls_free( lo->ldo_server_controls );
+
+                       if( controls == NULL || *controls == NULL ) {
+                               lo->ldo_server_controls = NULL;
+                               return 0;
+                       }
+                               
+                       lo->ldo_server_controls =
+                               ldap_controls_dup( (LDAPControl **) invalue );
+
+                       if(lo->ldo_server_controls == NULL) {
+                               /* memory allocation error ? */
+                               break;
+                       }
+               } return 0;
+
+       case LDAP_OPT_CLIENT_CONTROLS: {
+                       LDAPControl **controls = (LDAPControl **) invalue;
+
+                       ldap_controls_free( lo->ldo_client_controls );
+
+                       if( controls == NULL || *controls == NULL ) {
+                               lo->ldo_client_controls = NULL;
+                               return 0;
+                       }
+                               
+                       lo->ldo_client_controls =
+                               ldap_controls_dup( (LDAPControl **) invalue );
+
+                       if(lo->ldo_client_controls == NULL) {
+                               /* memory allocation error ? */
+                               break;
+                       }
+               } return 0;
+
+       case LDAP_OPT_HOST_NAME: {
+                       char* host = (char *) invalue;
+
+                       if(lo->ldo_defhost != NULL) {
+                               free(lo->ldo_defhost);
+                               lo->ldo_defhost = NULL;
+                       }
+
+                       if(host != NULL) {
+                               lo->ldo_defhost = strdup(host);
+                               return 0;
+                       }
+
+                       if(ld == NULL) {
+                               /*
+                                * must want global default returned
+                                * to initial condition.
+                                */
+                               lo->ldo_defhost = strdup("localhost");
+
+                       } else {
+                               /*
+                                * must want the session default
+                                *   updated to the current global default
+                                */
+                               lo->ldo_defhost = strdup(
+                                       openldap_ldap_global_options.ldo_defhost);
+                       }
+               } return 0;
+
+       case LDAP_OPT_ERROR_NUMBER: {
+                       int err = * (int *) invalue;
+
+                       if(ld == NULL) {
+                               /* need a struct ldap */
+                               break;
+                       }
+
+                       ld->ld_errno = err;
+               } return 0;
+
+       case LDAP_OPT_ERROR_STRING: {
+                       char* err = (char *) invalue;
+
+                       if(ld == NULL) {
+                               /* need a struct ldap */
+                               break;
+                       }
+
+                       if( ld->ld_error ) {
+                               free(ld->ld_error);
+                       }
+
+                       ld->ld_error = strdup(err);
+               } return 0;
+
+       case LDAP_OPT_API_FEATURE_INFO:
+               /* read-only */
                break;
+
+       case LDAP_OPT_DEBUG_LEVEL:
+               lo->ldo_debug = * (int *) invalue;
+               return 0;
+
        default:
                /* bad param */
                break;