X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-integ%2Frecipes-support%2Fopenldap%2Ffiles%2F0009-openldap-syncrepl-unset-tls-options.patch;fp=meta-starlingx%2Fmeta-stx-integ%2Frecipes-support%2Fopenldap%2Ffiles%2F0009-openldap-syncrepl-unset-tls-options.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=6525ba459512dd67ee823caf071257f194818c8e;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0009-openldap-syncrepl-unset-tls-options.patch b/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0009-openldap-syncrepl-unset-tls-options.patch
deleted file mode 100644
index 6525ba4..0000000
--- a/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0009-openldap-syncrepl-unset-tls-options.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From d87f33bf42e3ee1ce47ea61fde809fe693eede87 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:42:04 -0800
-Subject: [PATCH 09/20] openldap syncrepl unset tls options
-
-From Stx 1901: openldap-syncrepl-unset-tls-options.patch
-
-allow unsetting of tls_* syncrepl options
-
-Author: Patrick Monnerat <pm@datasphere.ch>
-Upstream ITS: #7042
-Resolves: #734187
----
- libraries/libldap/tls2.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index d25c190..46ccefa 100644
---- a/libraries/libldap/tls2.c
-+++ b/libraries/libldap/tls2.c
-@@ -747,27 +747,27 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
- 		return 0;
- 	case LDAP_OPT_X_TLS_CACERTFILE:
- 		if ( lo->ldo_tls_cacertfile ) LDAP_FREE( lo->ldo_tls_cacertfile );
--		lo->ldo_tls_cacertfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+		lo->ldo_tls_cacertfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- 		return 0;
- 	case LDAP_OPT_X_TLS_CACERTDIR:
- 		if ( lo->ldo_tls_cacertdir ) LDAP_FREE( lo->ldo_tls_cacertdir );
--		lo->ldo_tls_cacertdir = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+		lo->ldo_tls_cacertdir = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- 		return 0;
- 	case LDAP_OPT_X_TLS_CERTFILE:
- 		if ( lo->ldo_tls_certfile ) LDAP_FREE( lo->ldo_tls_certfile );
--		lo->ldo_tls_certfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+		lo->ldo_tls_certfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- 		return 0;
- 	case LDAP_OPT_X_TLS_KEYFILE:
- 		if ( lo->ldo_tls_keyfile ) LDAP_FREE( lo->ldo_tls_keyfile );
--		lo->ldo_tls_keyfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+		lo->ldo_tls_keyfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- 		return 0;
- 	case LDAP_OPT_X_TLS_DHFILE:
- 		if ( lo->ldo_tls_dhfile ) LDAP_FREE( lo->ldo_tls_dhfile );
--		lo->ldo_tls_dhfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+		lo->ldo_tls_dhfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- 		return 0;
- 	case LDAP_OPT_X_TLS_CRLFILE:	/* GnuTLS only */
- 		if ( lo->ldo_tls_crlfile ) LDAP_FREE( lo->ldo_tls_crlfile );
--		lo->ldo_tls_crlfile = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+		lo->ldo_tls_crlfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- 		return 0;
- 	case LDAP_OPT_X_TLS_REQUIRE_CERT:
- 		if ( !arg ) return -1;
-@@ -795,7 +795,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
- #endif
- 	case LDAP_OPT_X_TLS_CIPHER_SUITE:
- 		if ( lo->ldo_tls_ciphersuite ) LDAP_FREE( lo->ldo_tls_ciphersuite );
--		lo->ldo_tls_ciphersuite = arg ? LDAP_STRDUP( (char *) arg ) : NULL;
-+		lo->ldo_tls_ciphersuite = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- 		return 0;
- 
- 	case LDAP_OPT_X_TLS_PROTOCOL_MIN:
-@@ -806,7 +806,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
- 		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;
-+		lo->ldo_tls_randfile = (arg && *(char *)arg) ? LDAP_STRDUP( (char *) arg ) : NULL;
- 		break;
- 	case LDAP_OPT_X_TLS_NEWCTX:
- 		if ( !arg ) return -1;
--- 
-2.17.1
-