Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openldap2 for openSUSE:Factory
checked in at 2022-05-23 15:51:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openldap2 (Old)
and /work/SRC/openSUSE:Factory/.openldap2.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openldap2"
Mon May 23 15:51:43 2022 rev:174 rq:978469 version:2.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/openldap2/openldap2.changes 2022-04-14
17:23:25.879120739 +0200
+++ /work/SRC/openSUSE:Factory/.openldap2.new.2254/openldap2.changes
2022-05-23 15:51:44.562646212 +0200
@@ -1,0 +2,6 @@
+Thu May 12 02:48:19 UTC 2022 - William Brown <william.br...@suse.com>
+
+- bsc#1199277 - Resolve segfault when calling new ctx with global ctx
+* 0017-Resolve-error-handling-in-new-ctx-when-global.patch
+
+-------------------------------------------------------------------
New:
----
0017-Resolve-error-handling-in-new-ctx-when-global.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openldap2.spec ++++++
--- /var/tmp/diff_new_pack.d5aPkT/_old 2022-05-23 15:51:45.282646891 +0200
+++ /var/tmp/diff_new_pack.d5aPkT/_new 2022-05-23 15:51:45.290646899 +0200
@@ -56,6 +56,7 @@
Patch5: 0005-pie-compile.dif
Patch8: 0008-In-monitor-backend-do-not-return-Connection0-entries.patch
Patch16: 0016-Clear-shared-key-only-in-close-function.patch
+Patch17: 0017-Resolve-error-handling-in-new-ctx-when-global.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: argon2-devel
@@ -243,6 +244,7 @@
%patch5 -p1
%patch8 -p1
%patch16 -p1
+%patch17 -p1
cp %{SOURCE5} .
%build
++++++ 0017-Resolve-error-handling-in-new-ctx-when-global.patch ++++++
>From 43778f8b24f86af411fb5ed6df69851459abe561 Mon Sep 17 00:00:00 2001
From: William Brown <wbr...@suse.de>
Date: Thu, 12 May 2022 12:46:57 +1000
Subject: [PATCH] Resolve error handling in new ctx when global
---
libraries/libldap/tls2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
index 6d36db1984..f18992e781 100644
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
@@ -989,7 +989,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
lo->ldo_tls_ctx = NULL;
errmsg[0] = 0;
rc = ldap_int_tls_init_ctx( lo, *(int *)arg, errmsg );
- if ( rc && errmsg[0] ) {
+ if ( ld && rc && errmsg[0] ) {
if ( ld->ld_error )
LDAP_FREE( ld->ld_error );
ld->ld_error = LDAP_STRDUP( errmsg );
--
2.36.1
