X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ftls.c;h=53c4e3b0804090d6387be7feaa05873f3a9bc527;hb=9e0958d5bc342e2f35f6ee8aaa6cf179b2d55085;hp=c633ac084e1c631ed1e32c854152943bbb25e116;hpb=5c63fd55b5886e0b0ed7b3e28871d73aed260c4e;p=openldap

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index c633ac084e..53c4e3b080 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -378,21 +379,19 @@ ldap_pvt_tls_config( struct ldapoptions *lo, int option, const char *arg )
 		      ( strcasecmp( arg, "true" ) == 0 ) );
 		return ldap_pvt_tls_set_option( NULL, option, (void *) &i );
 	case LDAP_OPT_X_TLS:
+		i = -1;
 		if ( strcasecmp( arg, "never" ) == 0 )
-			return ldap_pvt_tls_set_option( lo, option,
-				LDAP_OPT_X_TLS_NEVER );
+			i = LDAP_OPT_X_TLS_NEVER ;
 		if ( strcasecmp( arg, "demand" ) == 0 )
-			return ldap_pvt_tls_set_option( lo, option,
-				LDAP_OPT_X_TLS_DEMAND );
+			i = LDAP_OPT_X_TLS_DEMAND ;
 		if ( strcasecmp( arg, "allow" ) == 0 )
-			return ldap_pvt_tls_set_option( lo, option,
-				LDAP_OPT_X_TLS_ALLOW );
+			i = LDAP_OPT_X_TLS_ALLOW ;
 		if ( strcasecmp( arg, "try" ) == 0 )
-			return ldap_pvt_tls_set_option( lo, option,
-				LDAP_OPT_X_TLS_TRY );
+			i = LDAP_OPT_X_TLS_TRY ;
 		if ( strcasecmp( arg, "hard" ) == 0 )
-			return ldap_pvt_tls_set_option( lo, option,
-				LDAP_OPT_X_TLS_HARD );
+			i = LDAP_OPT_X_TLS_HARD ;
+		if (i >= 0)
+			return ldap_pvt_tls_set_option( lo, option, &i );
 		return -1;
 	default:
 		return -1;