]> git.sur5r.net Git - openldap/blobdiff - libraries/libldap/options.c
Fix typo in previous commit.
[openldap] / libraries / libldap / options.c
index b52e95cc7866cd9e9e21b39f1a82359fc757e376..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>
@@ -8,6 +13,35 @@
 
 #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    *ld,
@@ -49,7 +83,22 @@ ldap_get_option(
                        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;
+
+                       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;
 
@@ -90,25 +139,33 @@ ldap_get_option(
                return 0;
 
        case LDAP_OPT_PROTOCOL_VERSION:
-               if(ld == NULL) {
-                       /* bad param */
-                       break;
-               } 
-
-               * (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:
-               if(ld == NULL) {
-                       /* bad param */
-                       break;
-               } 
-               * (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:
@@ -120,13 +177,45 @@ ldap_get_option(
                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;
@@ -201,13 +290,108 @@ ldap_set_option(
                        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;