From: Quanah Gibson-Mount Date: Tue, 17 Feb 2009 21:47:09 +0000 (+0000) Subject: Revert part of last commit X-Git-Tag: ACLCHECK_0~816 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3b743a3b79f7358fe88f49e357964f3348650090;p=openldap Revert part of last commit Remove erroneous comment --- diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c index 993e196106..ff2a2d2b52 100644 --- a/libraries/libldap/tls2.c +++ b/libraries/libldap/tls2.c @@ -649,12 +649,10 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg ) case LDAP_OPT_X_TLS_PROTOCOL_MIN: *(int *)arg = lo->ldo_tls_protocol_min; break; -#ifdef HAVE_OPENSSL - case LDAP_OPT_X_TLS_RANDOM_FILE: /* OpenSSL only */ + case LDAP_OPT_X_TLS_RANDOM_FILE: *(char **)arg = lo->ldo_tls_randfile ? LDAP_STRDUP( lo->ldo_tls_randfile ) : NULL; break; -#endif case LDAP_OPT_X_TLS_SSL_CTX: { void *retval = 0; if ( ld != NULL ) { @@ -788,14 +786,12 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg ) if ( !arg ) return -1; lo->ldo_tls_protocol_min = *(int *)arg; return 0; -#ifdef HAVE_OPENSSL - case LDAP_OPT_X_TLS_RANDOM_FILE: /* OpenSSL only */ + case LDAP_OPT_X_TLS_RANDOM_FILE: if ( ld != NULL ) return -1; if ( lo->ldo_tls_randfile ) LDAP_FREE (lo->ldo_tls_randfile ); lo->ldo_tls_randfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL; break; -#endif case LDAP_OPT_X_TLS_NEWCTX: if ( !arg ) return -1; if ( lo->ldo_tls_ctx )