From 001952a0dea8948397cfa5aa478c75aa055667630b7b5c52338bfe8d83fda823 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 10 Jan 2008 01:35:52 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=17 --- libldap-pagedresults.dif | 13 +++++++++++++ openldap2-client.changes | 5 +++++ openldap2-client.spec | 8 ++++++-- openldap2.changes | 5 +++++ openldap2.spec | 8 ++++++-- 5 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 libldap-pagedresults.dif diff --git a/libldap-pagedresults.dif b/libldap-pagedresults.dif new file mode 100644 index 0000000..e8f99bf --- /dev/null +++ b/libldap-pagedresults.dif @@ -0,0 +1,13 @@ +Index: openldap-2.4.7/libraries/libldap/pagectrl.c +=================================================================== +--- openldap-2.4.7.orig/libraries/libldap/pagectrl.c ++++ openldap-2.4.7/libraries/libldap/pagectrl.c +@@ -256,7 +256,7 @@ ldap_parse_page_control( + + ld->ld_errno = ldap_parse_pageresponse_control( ld, c, countp, &cookie ); + if ( ld->ld_errno == LDAP_SUCCESS ) { +- *cookiep = LDAP_MALLOC( sizeof( struct berval * ) ); ++ *cookiep = LDAP_MALLOC( sizeof( struct berval ) ); + if ( *cookiep == NULL ) { + ld->ld_errno = LDAP_NO_MEMORY; + } else { diff --git a/openldap2-client.changes b/openldap2-client.changes index ae16351..8cad6c7 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 9 13:29:33 CET 2008 - rhafer@suse.de + +- Fixed allocation for paged results cookie (Bug #352255, ITS#5315) + ------------------------------------------------------------------- Fri Dec 14 13:53:33 CET 2007 - rhafer@suse.de diff --git a/openldap2-client.spec b/openldap2-client.spec index fe2a5a2..ee2b619 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,7 +1,7 @@ # # spec file for package openldap2-client (Version 2.4.7) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -28,7 +28,7 @@ Summary: OpenLDAP2 Client Utilities %endif AutoReqProv: on Version: 2.4.7 -Release: 2 +Release: 6 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: addonschema.tar.gz @@ -43,6 +43,7 @@ Patch5: openldap-ntlm.diff Patch6: libldap-gethostbyname_r.dif Patch7: pie-compile.dif Patch8: slapd_getaddrinfo_dupl.dif +Patch9: libldap-pagedresults.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -117,6 +118,7 @@ Authors: %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build %{?suse_update_config:%{suse_update_config -f build}} @@ -346,6 +348,8 @@ fi %endif %changelog +* Wed Jan 09 2008 - rhafer@suse.de +- Fixed allocation for paged results cookie (Bug #352255, ITS#5315) * Fri Dec 14 2007 - rhafer@suse.de - Update to Version 2.4.7. Most important changes: * Added slapd ordered indexing of integer attributes (ITS#5239) diff --git a/openldap2.changes b/openldap2.changes index ae16351..8cad6c7 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 9 13:29:33 CET 2008 - rhafer@suse.de + +- Fixed allocation for paged results cookie (Bug #352255, ITS#5315) + ------------------------------------------------------------------- Fri Dec 14 13:53:33 CET 2007 - rhafer@suse.de diff --git a/openldap2.spec b/openldap2.spec index d3facbc..67edeec 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -1,7 +1,7 @@ # # spec file for package openldap2 (Version 2.4.7) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -28,7 +28,7 @@ Summary: The New OpenLDAP Server (LDAPv3) %endif AutoReqProv: on Version: 2.4.7 -Release: 2 +Release: 6 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: addonschema.tar.gz @@ -43,6 +43,7 @@ Patch5: openldap-ntlm.diff Patch6: libldap-gethostbyname_r.dif Patch7: pie-compile.dif Patch8: slapd_getaddrinfo_dupl.dif +Patch9: libldap-pagedresults.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -120,6 +121,7 @@ Authors: %patch6 %patch7 %patch8 -p1 +%patch9 -p1 %build %{?suse_update_config:%{suse_update_config -f build}} @@ -349,6 +351,8 @@ fi %endif %changelog +* Wed Jan 09 2008 - rhafer@suse.de +- Fixed allocation for paged results cookie (Bug #352255, ITS#5315) * Fri Dec 14 2007 - rhafer@suse.de - Update to Version 2.4.7. Most important changes: * Added slapd ordered indexing of integer attributes (ITS#5239)