remove openldap-syncrepl-unset-tls-options.patch
Unaccepted upstream, not an issue, documented in the man pages.
This commit is contained in:
parent
2594744e83
commit
c3de3dd938
@ -1,62 +0,0 @@
|
|||||||
allow unsetting of tls_* syncrepl options
|
|
||||||
|
|
||||||
Author: Patrick Monnerat <pm@datasphere.ch>
|
|
||||||
Upstream ITS: #7042
|
|
||||||
Resolves: #734187
|
|
||||||
|
|
||||||
diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
|
|
||||||
index 654a4bf..10b993b 100644
|
|
||||||
--- a/libraries/libldap/tls2.c
|
|
||||||
+++ b/libraries/libldap/tls2.c
|
|
||||||
@@ -735,27 +735,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;
|
|
||||||
@@ -783,7 +783,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:
|
|
||||||
@@ -794,7 +794,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;
|
|
@ -28,7 +28,6 @@ Patch0: openldap-manpages.patch
|
|||||||
Patch2: openldap-sql-linking.patch
|
Patch2: openldap-sql-linking.patch
|
||||||
Patch3: openldap-reentrant-gethostby.patch
|
Patch3: openldap-reentrant-gethostby.patch
|
||||||
Patch4: openldap-smbk5pwd-overlay.patch
|
Patch4: openldap-smbk5pwd-overlay.patch
|
||||||
Patch8: openldap-syncrepl-unset-tls-options.patch
|
|
||||||
Patch9: openldap-man-sasl-nocanon.patch
|
Patch9: openldap-man-sasl-nocanon.patch
|
||||||
Patch10: openldap-ai-addrconfig.patch
|
Patch10: openldap-ai-addrconfig.patch
|
||||||
Patch11: openldap-nss-update-list-of-ciphers.patch
|
Patch11: openldap-nss-update-list-of-ciphers.patch
|
||||||
@ -151,7 +150,6 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch8 -p1
|
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
%patch11 -p1
|
%patch11 -p1
|
||||||
@ -583,6 +581,7 @@ exit 0
|
|||||||
- remove openldap-fedora-systemd.patch
|
- remove openldap-fedora-systemd.patch
|
||||||
- remove openldap-ldaprc-currentdir.patch
|
- remove openldap-ldaprc-currentdir.patch
|
||||||
- remove openldap-userconfig-setgid.patch
|
- remove openldap-userconfig-setgid.patch
|
||||||
|
- remove openldap-syncrepl-unset-tls-options.patch
|
||||||
|
|
||||||
* Wed Dec 17 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.40-5
|
* Wed Dec 17 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.40-5
|
||||||
- harden the build
|
- harden the build
|
||||||
|
Loading…
Reference in New Issue
Block a user