+/*
+ * 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 char* features[] = {
+static const LDAPAPIFeatureInfo features[] = {
+#ifdef LDAP_API_FEATURE_X_OPENLDAP
+ { /* OpenLDAP Extensions API Feature */
+ LDAP_FEATURE_INFO_VERSION,
+ "X_OPENLDAP",
+ LDAP_API_FEATURE_X_OPENLDAP
+ },
+#endif
+
+#ifdef LDAP_API_FEATURE_THREAD_SAFE
+ { /* Basic Thread Safe */
+ LDAP_FEATURE_INFO_VERSION,
+ "THREAD_SAFE",
+ LDAP_API_FEATURE_THREAD_SAFE
+ },
+#endif
+#ifdef LDAP_API_FEATURE_SESSION_THREAD_SAFE
+ { /* Session Thread Safe */
+ LDAP_FEATURE_INFO_VERSION,
+ "SESSION_THREAD_SAFE",
+ LDAP_API_FEATURE_SESSION_THREAD_SAFE
+ },
+#endif
+#ifdef LDAP_API_FEATURE_OPERATION_THREAD_SAFE
+ { /* Operation Thread Safe */
+ LDAP_FEATURE_INFO_VERSION,
+ "OPERATION_THREAD_SAFE",
+ LDAP_API_FEATURE_OPERATION_THREAD_SAFE
+ },
+#endif
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
+ { /* OpenLDAP Reentrant */
+ LDAP_FEATURE_INFO_VERSION,
+ "X_OPENLDAP_REENTRANT",
+ LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
+ },
+#endif
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE ) && \
+ defined( LDAP_THREAD_SAFE )
+ { /* OpenLDAP Thread Safe */
+ LDAP_FEATURE_INFO_VERSION,
+ "X_OPENLDAP_THREAD_SAFE",
+ LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
+ },
+#endif
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
- "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
- "X_OPENLDAP_V2_REFERRALS",
+ { /* V2 Referrals */
+ LDAP_FEATURE_INFO_VERSION,
+ "X_OPENLDAP_V2_REFERRALS",
+ LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+ },
#endif
- NULL
+ {0, NULL, 0}
};
int
info->ldapai_api_version = LDAP_API_VERSION;
info->ldapai_api_version = LDAP_API_VERSION;
info->ldapai_protocol_version = LDAP_VERSION_MAX;
- if(features[0] == NULL) {
+
+ if(features[0].ldapaif_name == NULL) {
info->ldapai_extensions = NULL;
} else {
int i;
- info->ldapai_extensions = malloc(sizeof(features));
+ info->ldapai_extensions = malloc(sizeof(char *) *
+ sizeof(features)/sizeof(LDAPAPIFeatureInfo));
- for(i=0; features[i] != NULL; i++) {
- info->ldapai_extensions[i] = strdup(features[i]);
+ for(i=0; features[i].ldapaif_name != NULL; i++) {
+ info->ldapai_extensions[i] =
+ strdup(features[i].ldapaif_name);
}
info->ldapai_extensions[i] = NULL;
break;
}
- * (int *) outvalue = ld->ld_sb.sb_sd;
+ * (int *) outvalue = ber_pvt_sb_get_desc( &(ld->ld_sb) );
return 0;
case LDAP_OPT_DEREF:
return 0;
case LDAP_OPT_REFERRALS:
- * (int *) outvalue = (int) LDAP_BOOL_GET(lo, LDAP_BOOL_REFERRALS);
+ * (int *) outvalue = (LDAP_BOOL_GET(lo, LDAP_BOOL_REFERRALS) ==
+ LDAP_OPT_ON);
return 0;
case LDAP_OPT_RESTART:
- * (int *) outvalue = (int) LDAP_BOOL_GET(lo, LDAP_BOOL_RESTART);
+ * (int *) outvalue = (LDAP_BOOL_GET(lo, LDAP_BOOL_RESTART) ==
+ LDAP_OPT_ON);
return 0;
case LDAP_OPT_DNS: /* LDAPv2 */
- * (int *) outvalue = (int) LDAP_BOOL_GET(lo, LDAP_BOOL_DNS);
+ * (int *) outvalue = (LDAP_BOOL_GET(lo, LDAP_BOOL_DNS) ==
+ LDAP_OPT_ON);
return 0;
case LDAP_OPT_PROTOCOL_VERSION:
return 0;
case LDAP_OPT_SERVER_CONTROLS:
+ * (LDAPControl ***) outvalue =
+ ldap_controls_dup( lo->ldo_sctrls );
+
+ return 0;
+
case LDAP_OPT_CLIENT_CONTROLS:
- /* not yet supported */
- break;
+ * (LDAPControl ***) outvalue =
+ ldap_controls_dup( lo->ldo_cctrls );
+
+ return 0;
case LDAP_OPT_HOST_NAME:
/*
* draft-ietf-ldapext-ldap-c-api-01 doesn't state
- * whether client to have to free host names or no,
- * we do
+ * whether caller has to free host names or not,
+ * we do.
*/
* (char **) outvalue = strdup(lo->ldo_defhost);
return 0;
case LDAP_OPT_ERROR_STRING:
- /* not yet supported */
if(ld == NULL) {
/* bad param */
break;
} else {
* (char **) outvalue = strdup(ld->ld_error);
}
+
+ return 0;
+
+ case LDAP_OPT_MATCH_STRING:
+ 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_matched == NULL ) {
+ * (char **) outvalue = NULL;
+ } else {
+ * (char **) outvalue = strdup(ld->ld_matched);
+ }
+
+ return 0;
+
+ case LDAP_OPT_API_FEATURE_INFO: {
+ LDAPAPIFeatureInfo *info = (LDAPAPIFeatureInfo *) outvalue;
+ int i;
+
+ if(info == NULL) return -1;
+
+ if(info->ldapaif_info_version != LDAP_FEATURE_INFO_VERSION) {
+ /* api info version mismatch */
+ info->ldapaif_info_version = LDAP_FEATURE_INFO_VERSION;
+ 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;
ldap_set_option(
LDAP *ld,
int option,
- void *invalue)
+ LDAP_CONST void *invalue)
{
struct ldapoptions *lo;
openldap_ldap_initialize();
}
- if(invalue == NULL) {
- /* no place to set from */
- return -1;
- }
-
if(ld == NULL) {
lo = &openldap_ldap_global_options;
} else {
lo = &ld->ld_options;
}
+ switch(option) {
+ case LDAP_OPT_REFERRALS:
+ if(invalue == LDAP_OPT_ON) {
+ LDAP_BOOL_SET(lo, LDAP_BOOL_REFERRALS);
+ } else {
+ LDAP_BOOL_CLR(lo, LDAP_BOOL_REFERRALS);
+ }
+ return 0;
+
+ case LDAP_OPT_RESTART:
+ if(invalue == LDAP_OPT_ON) {
+ LDAP_BOOL_SET(lo, LDAP_BOOL_RESTART);
+ } else {
+ LDAP_BOOL_CLR(lo, LDAP_BOOL_RESTART);
+ }
+ return 0;
+ }
+
+ if(invalue == NULL) {
+ /* no place to set from */
+ return -1;
+ }
+
switch(option) {
case LDAP_OPT_API_INFO:
case LDAP_OPT_DESC:
lo->ldo_timelimit = * (int *) invalue;
return 0;
- case LDAP_OPT_REFERRALS:
- if((int) invalue == (int) LDAP_OPT_ON) {
- LDAP_BOOL_SET(lo, LDAP_BOOL_REFERRALS);
- } else {
- LDAP_BOOL_CLR(lo, LDAP_BOOL_REFERRALS);
- }
- return 0;
-
- case LDAP_OPT_RESTART:
- if((int) invalue == (int) LDAP_OPT_ON) {
- LDAP_BOOL_SET(lo, LDAP_BOOL_RESTART);
- } else {
- LDAP_BOOL_CLR(lo, LDAP_BOOL_RESTART);
- }
- return 0;
-
case LDAP_OPT_PROTOCOL_VERSION: {
int vers = * (int *) invalue;
if (vers < LDAP_VERSION_MIN || vers > LDAP_VERSION_MAX) {
ld->ld_version = vers;
} return 0;
- case LDAP_OPT_SERVER_CONTROLS:
- case LDAP_OPT_CLIENT_CONTROLS:
- /* not yet supported */
- break;
+ case LDAP_OPT_SERVER_CONTROLS: {
+ LDAPControl **controls = (LDAPControl **) invalue;
+
+ ldap_controls_free( lo->ldo_sctrls );
+
+ if( controls == NULL || *controls == NULL ) {
+ lo->ldo_sctrls = NULL;
+ return 0;
+ }
+
+ lo->ldo_sctrls =
+ ldap_controls_dup( (LDAPControl **) invalue );
+
+ if(lo->ldo_sctrls == NULL) {
+ /* memory allocation error ? */
+ break;
+ }
+ } return 0;
+
+ case LDAP_OPT_CLIENT_CONTROLS: {
+ LDAPControl **controls = (LDAPControl **) invalue;
+
+ ldap_controls_free( lo->ldo_cctrls );
+
+ if( controls == NULL || *controls == NULL ) {
+ lo->ldo_cctrls = NULL;
+ return 0;
+ }
+
+ lo->ldo_cctrls =
+ ldap_controls_dup( (LDAPControl **) invalue );
+
+ if(lo->ldo_cctrls == NULL) {
+ /* memory allocation error ? */
+ break;
+ }
+ } return 0;
case LDAP_OPT_HOST_NAME: {
- char* host = * (char **) invalue;
+ char* host = (char *) invalue;
if(lo->ldo_defhost != NULL) {
free(lo->ldo_defhost);
case LDAP_OPT_ERROR_NUMBER: {
int err = * (int *) invalue;
- if (err != 0 ) {
- /* not supported */
- /* we only allow ld_errno to be cleared. */
- break;
- }
-
if(ld == NULL) {
/* need a struct ldap */
break;
} return 0;
case LDAP_OPT_ERROR_STRING: {
- char* err = * (char **) invalue;
-
- if (err != NULL ) {
- /* not supported */
- /* we only allow ld_error to be cleared. */
- break;
- }
+ char* err = (char *) invalue;
if(ld == NULL) {
/* need a struct ldap */
break;
}
- ld->ld_error = err;
+ 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;
projects / openldap / blobdiff