From e3911195a1f23420ef6ca441cf60867396090c7419e97db49d22c32fb76299f5 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 3 May 2007 22:39:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=8 --- openldap2-client.changes | 5 +++++ openldap2-client.spec | 6 +++++- openldap2.changes | 5 +++++ openldap2.spec | 6 +++++- string-compare.diff | 11 +++++++++++ 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 string-compare.diff diff --git a/openldap2-client.changes b/openldap2-client.changes index 9149f32..0cd3837 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 2 14:05:05 CEST 2007 - dmueller@suse.de + +- Fix comparison with string literal + ------------------------------------------------------------------- Wed Apr 18 15:16:43 CEST 2007 - schwab@suse.de diff --git a/openldap2-client.spec b/openldap2-client.spec index 834dc3b..c8ceec7 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -28,7 +28,7 @@ Summary: OpenLDAP2 Client Utilities %endif Autoreqprov: on Version: 2.3.34 -Release: 10 +Release: 15 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: openldap-admin-guide.tar.bz2 @@ -45,6 +45,7 @@ Patch6: libldap-gethostbyname_r.dif Patch7: pie-compile.dif Patch8: libldap-manpages.dif Patch9: slapd_chain_return_error.dif +Patch10: string-compare.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: %{_prefix} @@ -123,6 +124,7 @@ Authors: %endif %patch8 -p1 %patch9 -p1 +%patch10 %build %{?suse_update_config:%{suse_update_config -f build}} @@ -343,6 +345,8 @@ fi %endif %changelog +* Wed May 02 2007 - dmueller@suse.de +- Fix comparison with string literal * Wed Apr 18 2007 - schwab@suse.de - Fix generation of debuginfo packages. * Tue Mar 20 2007 - rguenther@suse.de diff --git a/openldap2.changes b/openldap2.changes index 9149f32..0cd3837 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 2 14:05:05 CEST 2007 - dmueller@suse.de + +- Fix comparison with string literal + ------------------------------------------------------------------- Wed Apr 18 15:16:43 CEST 2007 - schwab@suse.de diff --git a/openldap2.spec b/openldap2.spec index 671c729..cbf0ffa 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -28,7 +28,7 @@ Summary: The New OpenLDAP Server (LDAPv3) %endif Autoreqprov: on Version: 2.3.34 -Release: 10 +Release: 15 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: openldap-admin-guide.tar.bz2 @@ -45,6 +45,7 @@ Patch6: libldap-gethostbyname_r.dif Patch7: pie-compile.dif Patch8: libldap-manpages.dif Patch9: slapd_chain_return_error.dif +Patch10: string-compare.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: %{_prefix} @@ -126,6 +127,7 @@ Authors: %endif %patch8 -p1 %patch9 -p1 +%patch10 %build %{?suse_update_config:%{suse_update_config -f build}} @@ -346,6 +348,8 @@ fi %endif %changelog +* Wed May 02 2007 - dmueller@suse.de +- Fix comparison with string literal * Wed Apr 18 2007 - schwab@suse.de - Fix generation of debuginfo packages. * Tue Mar 20 2007 - rguenther@suse.de diff --git a/string-compare.diff b/string-compare.diff new file mode 100644 index 0000000..6470fb0 --- /dev/null +++ b/string-compare.diff @@ -0,0 +1,11 @@ +--- servers/slapd/overlays/ppolicy.c ++++ servers/slapd/overlays/ppolicy.c +@@ -848,7 +848,7 @@ ctrls_cleanup( Operation *op, SlapReply + assert( rs->sr_ctrls[0] != NULL ); + + for ( n = 0; rs->sr_ctrls[n]; n++ ) { +- if ( rs->sr_ctrls[n]->ldctl_oid == LDAP_CONTROL_PASSWORDPOLICYRESPONSE ) { ++ if ( !strcmp(rs->sr_ctrls[n]->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE) ) { + ch_free( rs->sr_ctrls[n]->ldctl_value.bv_val ); + ch_free( rs->sr_ctrls[n] ); + rs->sr_ctrls[n] = (LDAPControl *)(-1);