Blame SOURCES/openldap-syncrepl-unset-tls-options.patch

103552
allow unsetting of tls_* syncrepl options
103552
103552
Author: Patrick Monnerat <pm@datasphere.ch>
103552
Upstream ITS: #7042
103552
Resolves: #734187
103552
103552
diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
103552
index 654a4bf..10b993b 100644
103552
--- a/libraries/libldap/tls2.c
103552
+++ b/libraries/libldap/tls2.c
103552
@@ -735,27 +735,27 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
103552
 		return 0;
103552
 	case LDAP_OPT_X_TLS_CACERTFILE:
103552
 		if ( lo->ldo_tls_cacertfile ) LDAP_FREE( lo->ldo_tls_cacertfile );
103552
-		lo->ldo_tls_cacertfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
+		lo->ldo_tls_cacertfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
 		return 0;
103552
 	case LDAP_OPT_X_TLS_CACERTDIR:
103552
 		if ( lo->ldo_tls_cacertdir ) LDAP_FREE( lo->ldo_tls_cacertdir );
103552
-		lo->ldo_tls_cacertdir = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
+		lo->ldo_tls_cacertdir = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
 		return 0;
103552
 	case LDAP_OPT_X_TLS_CERTFILE:
103552
 		if ( lo->ldo_tls_certfile ) LDAP_FREE( lo->ldo_tls_certfile );
103552
-		lo->ldo_tls_certfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
+		lo->ldo_tls_certfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
 		return 0;
103552
 	case LDAP_OPT_X_TLS_KEYFILE:
103552
 		if ( lo->ldo_tls_keyfile ) LDAP_FREE( lo->ldo_tls_keyfile );
103552
-		lo->ldo_tls_keyfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
+		lo->ldo_tls_keyfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
 		return 0;
103552
 	case LDAP_OPT_X_TLS_DHFILE:
103552
 		if ( lo->ldo_tls_dhfile ) LDAP_FREE( lo->ldo_tls_dhfile );
103552
-		lo->ldo_tls_dhfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
+		lo->ldo_tls_dhfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
 		return 0;
103552
 	case LDAP_OPT_X_TLS_CRLFILE:	/* GnuTLS only */
103552
 		if ( lo->ldo_tls_crlfile ) LDAP_FREE( lo->ldo_tls_crlfile );
103552
-		lo->ldo_tls_crlfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
+		lo->ldo_tls_crlfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
 		return 0;
103552
 	case LDAP_OPT_X_TLS_REQUIRE_CERT:
103552
 		if ( !arg ) return -1;
103552
@@ -783,7 +783,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
103552
 #endif
103552
 	case LDAP_OPT_X_TLS_CIPHER_SUITE:
103552
 		if ( lo->ldo_tls_ciphersuite ) LDAP_FREE( lo->ldo_tls_ciphersuite );
103552
-		lo->ldo_tls_ciphersuite = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
+		lo->ldo_tls_ciphersuite = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
 		return 0;
103552
 
103552
 	case LDAP_OPT_X_TLS_PROTOCOL_MIN:
103552
@@ -794,7 +794,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
103552
 		if ( ld != NULL )
103552
 			return -1;
103552
 		if ( lo->ldo_tls_randfile ) LDAP_FREE (lo->ldo_tls_randfile );
103552
-		lo->ldo_tls_randfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
+		lo->ldo_tls_randfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
103552
 		break;
103552
 	case LDAP_OPT_X_TLS_NEWCTX:
103552
 		if ( !arg ) return -1;