forked from jengelh/openldap2
Accepting request 769032 from network:ldap
OBS-URL: https://build.opensuse.org/request/show/769032 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=151
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2b43275f04
@ -1,47 +0,0 @@
|
||||
--- openldap-2.4.48.orig/servers/slapd/cancel.c 2019-07-23 16:46:22.000000000 +0200
|
||||
+++ openldap-2.4.48/servers/slapd/cancel.c 2020-01-10 13:15:53.884714390 +0100
|
||||
@@ -2,7 +2,7 @@
|
||||
/* $OpenLDAP$ */
|
||||
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||
*
|
||||
- * Copyright 1998-2019 The OpenLDAP Foundation.
|
||||
+ * Copyright 1998-2020 The OpenLDAP Foundation.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -34,7 +34,8 @@
|
||||
Operation *o;
|
||||
int rc;
|
||||
int opid;
|
||||
- BerElement *ber;
|
||||
+ BerElementBuffer berbuf;
|
||||
+ BerElement *ber = (BerElement *)&berbuf;
|
||||
|
||||
assert( ber_bvcmp( &slap_EXOP_CANCEL, &op->ore_reqoid ) == 0 );
|
||||
|
||||
@@ -43,19 +44,19 @@
|
||||
return LDAP_PROTOCOL_ERROR;
|
||||
}
|
||||
|
||||
- ber = ber_init( op->ore_reqdata );
|
||||
- if ( ber == NULL ) {
|
||||
- rs->sr_text = "internal error";
|
||||
- return LDAP_OTHER;
|
||||
+ if ( op->ore_reqdata->bv_len == 0 ) {
|
||||
+ rs->sr_text = "empty request data field";
|
||||
+ return LDAP_PROTOCOL_ERROR;
|
||||
}
|
||||
|
||||
+ /* ber_init2 uses reqdata directly, doesn't allocate new buffers */
|
||||
+ ber_init2( ber, op->ore_reqdata, 0 );
|
||||
+
|
||||
if ( ber_scanf( ber, "{i}", &opid ) == LBER_ERROR ) {
|
||||
rs->sr_text = "message ID parse failed";
|
||||
return LDAP_PROTOCOL_ERROR;
|
||||
}
|
||||
|
||||
- (void) ber_free( ber, 1 );
|
||||
-
|
||||
Statslog( LDAP_DEBUG_STATS, "%s CANCEL msg=%d\n",
|
||||
op->o_log_prefix, opid, 0, 0, 0 );
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d
|
||||
size 5704883
|
||||
3
openldap-2.4.49.tgz
Normal file
3
openldap-2.4.49.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e
|
||||
size 5704723
|
||||
@ -1,3 +1,44 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 30 20:57:33 UTC 2020 - Michael Ströder <michael@stroeder.com>
|
||||
|
||||
- updated to 2.4.49
|
||||
- removed obsolete back-port patches:
|
||||
* 0013_openldap-its9124_fix_crash_with_cancel_exop.patch
|
||||
- removed obsolete source file DB_CONFIG
|
||||
|
||||
OpenLDAP 2.4.49 Release (2020/01/30)
|
||||
Added slapd-monitor database entry count for slapd-mdb (ITS#9154)
|
||||
Fixed client tools to not add controls on cancel/abandon (ITS#9145)
|
||||
Fixed client tools SyncInfo message to be LDIF compliant (ITS#8116)
|
||||
Fixed libldap to correctly free sb (ITS#9081, ITS#8755)
|
||||
Fixed libldap descriptor leak if ldaps fails (ITS#9147)
|
||||
Fixed libldap remove unnecessary global mutex for GnuTLS (ITS#9069)
|
||||
Fixed slapd syntax evaluation of preferredDeliveryMethod (ITS#9067)
|
||||
Fixed slapd to relax domainScope control check (ITS#9100)
|
||||
Fixed slapd to have cleaner error handling during connection setup (ITS#9112)
|
||||
Fixed slapd data check when processing cancel exop (ITS#9124)
|
||||
Fixed slapd attribute description processing (ITS#9128)
|
||||
Fixed slapd-ldap to set oldctrls correctly (ITS#9076)
|
||||
Fixed slapd-mdb to honor unchecked limit with alias deref (ITS#7657)
|
||||
Fixed slapd-mdb missing final commit with slapindex (ITS#9095)
|
||||
Fixed slapd-mdb drop attr mappings added in an aborted txn (ITS#9091)
|
||||
Fixed slapd-mdb nosync FLAG configuration handling (ITS#9150)
|
||||
Fixed slapd-monitor global operation counter reporting (ITS#9119)
|
||||
Fixed slapo-ppolicy when used with slapauth (ITS#8629)
|
||||
Fixed slapo-ppolicy to add a missed normalised copy of pwdChangedTime (ITS#9126)
|
||||
Fixed slapo-syncprov fix sessionlog init (ITS#9146)
|
||||
Fixed slapo-unique loop termination (ITS#9077)
|
||||
Build Environment
|
||||
Fix mkdep to honor TMPDIR if set (ITS#9062)
|
||||
Remove ICU library detection (ITS#9144)
|
||||
Update config.guess and config.sub to support newer architectures (ITS#7855)
|
||||
Disable ITS8521 regression test as it is no longer valid (ITS#9015)
|
||||
Documentation
|
||||
admin24 - Fix inconsistent whitespace in replication section (ITS#9153)
|
||||
slapd-config(5)/slapd.conf(5) - Fix missing bold tag for keyword (ITS#9063)
|
||||
slapd-ldap(5) - Document "tls none" option (ITS#9071)
|
||||
slapo-ppolicy(5) - Correctly document pwdGraceAuthnLimit (ITS#9065)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 10 13:16:40 UTC 2020 - Michael Ströder <michael@stroeder.com>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
%endif
|
||||
|
||||
%define run_test_suite 0
|
||||
%define version_main 2.4.48
|
||||
%define version_main 2.4.49
|
||||
|
||||
%if %{suse_version} >= 1310 && %{suse_version} != 1315
|
||||
%define _rundir /run/slapd
|
||||
@ -63,7 +63,6 @@ Patch7: 0007-Recover-on-DB-version-change.dif
|
||||
Patch8: 0008-In-monitor-backend-do-not-return-Connection0-entries.patch
|
||||
Patch9: 0009-Fix-ldap-host-lookup-ipv6.patch
|
||||
Patch11: 0011-openldap-re24-its7796.patch
|
||||
Patch13: 0013_openldap-its9124_fix_crash_with_cancel_exop.patch
|
||||
Patch15: openldap-r-only.dif
|
||||
Patch16: 0016-Clear-shared-key-only-in-close-function.patch
|
||||
Source200: %{name_ppolicy_check_module}-%{version_ppolicy_check_module}.tar.gz
|
||||
@ -259,7 +258,6 @@ gzip -k %{S:203}
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch11 -p1
|
||||
%patch13 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
cp %{SOURCE5} .
|
||||
|
||||
Loading…
Reference in New Issue
Block a user