#include "ldap-int.h"
+static const char* features[] = {
+#ifdef LDAP_API_FEATURE_THREAD_SAFE
+ "THREAD_SAFE",
+#endif
+#ifdef LDAP_API_FEATURE_SESSION_THREAD_SAFE
+ "SESSION_THREAD_SAFE",
+#endif
+#ifdef LDAP_API_FEATURE_OPERATION_THREAD_SAFE
+ "OPERATION_THREAD_SAFE",
+#endif
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_REEENTRANT
+ "X_OPENLDAP_REENTRANT",
+#endif
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE ) && \
+ defined( LDAP_THREAD_SAFE )
+ "X_OPENLDAP_THREAD_SAFE",
+#endif
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
+ "X_OPENLDAP_V2_DNS",
+#endif
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+ "X_OPENLDAP_V2_REFERRALS",
+#endif
+ NULL
+};
+
int
ldap_get_option(
- LDAP *ldp,
+ LDAP *ld,
int option,
void *outvalue)
{
- LDAP *ld;
+ struct ldapoptions *lo;
if(!openldap_ldap_initialized) {
openldap_ldap_initialize();
return -1;
}
- if(ldp == NULL) {
- ld = &openldap_ld_globals;
+ if(ld == NULL) {
+ lo = &openldap_ldap_global_options;
} else {
- ld = ld;
+ lo = &ld->ld_options;
}
switch(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] == NULL) {
+ info->ldapai_extensions = NULL;
+ } else {
+ int i;
+ info->ldapai_extensions = malloc(sizeof(features));
+
+ for(i=0; features[i] != NULL; i++) {
+ info->ldapai_extensions[i] =
+ ldap_strdup(features[i]);
+ }
+
+ info->ldapai_extensions[i] = NULL;
+ }
+
+ info->ldapai_vendor_name = ldap_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;
}
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:
break;
case LDAP_OPT_HOST_NAME:
- * (char **) outvalue = ld->ld_host;
+ /*
+ * draft-ietf-ldapext-ldap-c-api-01 doesn't state
+ * whether client to have to free host names or no,
+ * we do
+ */
+
+ * (char **) outvalue = ldap_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 = ldap_strdup(ld->ld_error);
+ }
break;
default:
int
ldap_set_option(
- LDAP *ldp,
+ LDAP *ld,
int option,
void *invalue)
{
- LDAP *ld;
+ struct ldapoptions *lo;
if(!openldap_ldap_initialized) {
openldap_ldap_initialize();
return -1;
}
- if(ldp == NULL) {
- ld = &openldap_ld_globals;
+ if(ld == NULL) {
+ lo = &openldap_ldap_global_options;
} else {
- ld = ld;
+ lo = &ld->ld_options;
}
switch(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;
}
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 */
break;
+
+ 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 = ldap_strdup(host);
+ return 0;
+ }
+
+ if(ld == NULL) {
+ /*
+ * must want global default returned
+ * to initial condition.
+ */
+ lo->ldo_defhost = ldap_strdup("localhost");
+
+ } else {
+ /*
+ * must want the session default
+ * updated to the current global default
+ */
+ lo->ldo_defhost = ldap_strdup(
+ openldap_ldap_global_options.ldo_defhost);
+ }
+ } return 0;
+
+ 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;
+ }
+
+ ld->ld_errno = err;
+ } 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;
+ }
+
+ if(ld == NULL) {
+ /* need a struct ldap */
+ break;
+ }
+
+ ld->ld_error = err;
+ } return 0;
+
default:
/* bad param */
break;
projects / openldap / blobdiff