Merge ~sergiodj/ubuntu/+source/openldap:MRE-2.5.16-jammy into ubuntu/+source/openldap:ubuntu/jammy-devel

[Sergio Durigan Junior]

This is a new MRE for OpenLDAP on Jammy, version 2.5.16.

This version has been released today in order to fix a significant regression that was introduced in 2.5.15, which can cause slapd to abruptly terminate.

PPA: https://launchpad.net/~sergiodj/+archive/ubuntu/openldap

The package is building as I write this description. I will run its dep8 tests (and the dep8 tests from its reverse dependencies) as soon as possible.

[Bryce Harrington (bryce)]

Quite a concise upstream release, just a couple bugfixes.

I think this is fine as is if you're wanting to roll this out urgently. But if you're open to one nitpick, I'd suggest for the changelog to mention what the bug fixes were, since there's just two. Could even just include the changelog entry text verbatim. I notice only one of the upstream bug #'s is mentioned; if that is because it is a more urgent problem then that might be worth additional discussion. Otherwise, ITS#10067 could also be mentioned.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, bryce
Uploaders: sergiodj, bryce
MP auto-approved

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Monday, July 31 2023, Bryce Harrington wrote:

> Quite a concise upstream release, just a couple bugfixes.
>
> I think this is fine as is if you're wanting to roll this out
> urgently. But if you're open to one nitpick, I'd suggest for the
> changelog to mention what the bug fixes were, since there's just two.
> Could even just include the changelog entry text verbatim. I notice
> only one of the upstream bug #'s is mentioned; if that is because it
> is a more urgent problem then that might be worth additional
> discussion. Otherwise, ITS#10067 could also be mentioned.

Thank you, Bryce.

I'll adopt your suggestion and expand the changelog entry to include the
other bug.

I still have to wait for the dep8 tests to pass before I proceed because
that's what I committed to do in the Test Plan, but I'll upload the
package right after I have the results.

Cheers,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Sergio Durigan Junior (sergiodj)]

Uploaded:

$ dput openldap_2.5.16+dfsg-0ubuntu0.22.04.1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/openldap/openldap_2.5.16+dfsg-0ubuntu0.22.04.1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/openldap/openldap_2.5.16+dfsg-0ubuntu0.22.04.1.dsc: Valid signature from 106DA1C8C3CBBF14
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openldap_2.5.16+dfsg-0ubuntu0.22.04.1.dsc: done.
  Uploading openldap_2.5.16+dfsg.orig.tar.gz: done.
  Uploading openldap_2.5.16+dfsg-0ubuntu0.22.04.1.debian.tar.xz: done.
  Uploading openldap_2.5.16+dfsg-0ubuntu0.22.04.1_source.buildinfo: done.
  Uploading openldap_2.5.16+dfsg-0ubuntu0.22.04.1_source.changes: done.
Successfully uploaded packages.

diff --git a/CHANGES b/CHANGES
index 6256ae7..23c0e5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 OpenLDAP 2.5 Change Log
 
+OpenLDAP 2.5.16 Release (2023/07/31)
+	Fixed slapd cn=config incorrect handling of paused (ITS#10045)
+	Fixed slapd-meta to account for MOD ops being optional (ITS#10067)
+	Fixed slapd-asyncmeta to account for MOD ops being optional (ITS#10067)
+
 OpenLDAP 2.5.15 Release (2023/07/10)
 	Added libldap openssl3 support (ITS#9436, ITS#10030)
 	Fixed libldap handling of TCP KEEPALIVE options (ITS#10015)
diff --git a/build/version.var b/build/version.var
index 5bcd71b..cd4e7aa 100644
--- a/build/version.var
+++ b/build/version.var
@@ -15,9 +15,9 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=5
-ol_patch=15
-ol_api_inc=20515
+ol_patch=16
+ol_api_inc=20516
 ol_api_current=1
-ol_api_revision=10
+ol_api_revision=11
 ol_api_age=1
-ol_release_date="2023/07/10"
+ol_release_date="2023/07/31"
diff --git a/debian/changelog b/debian/changelog
index 61b5af5..df4030a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openldap (2.5.16+dfsg-0ubuntu0.22.04.1) jammy; urgency=medium
+
+  * New upstream version (LP: #2029170).
+    - Fixed slapd cn=config incorrect handling of paused (ITS#10045)
+    - Fixed slapd-meta to account for MOD ops being optional (ITS#10067)
+    - Fixed slapd-asyncmeta to account for MOD ops being optional (ITS#10067)
+  
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 31 Jul 2023 18:13:10 -0400
+
 openldap (2.5.15+dfsg-0ubuntu0.22.04.1) jammy; urgency=medium
 
   * New upstream version (LP: #2027079).
diff --git a/doc/guide/admin/guide.html b/doc/guide/admin/guide.html
index 5fb51d0..679b61e 100644
--- a/doc/guide/admin/guide.html
+++ b/doc/guide/admin/guide.html
@@ -23,7 +23,7 @@
 <DIV CLASS="title">
 <H1 CLASS="doc-title">OpenLDAP Software 2.5 Administrator's Guide</H1>
 <ADDRESS CLASS="doc-author">The OpenLDAP Project &lt;<A HREF="https://www.openldap.org/">https://www.openldap.org/</A>&gt;</ADDRESS>
-<ADDRESS CLASS="doc-modified">10 July 2023</ADDRESS>
+<ADDRESS CLASS="doc-modified">31 July 2023</ADDRESS>
 <BR CLEAR="All">
 </DIV>
 <DIV CLASS="contents">
diff --git a/servers/slapd/back-asyncmeta/modify.c b/servers/slapd/back-asyncmeta/modify.c
index a70bae8..c28bdc4 100644
--- a/servers/slapd/back-asyncmeta/modify.c
+++ b/servers/slapd/back-asyncmeta/modify.c
@@ -67,21 +67,15 @@ asyncmeta_back_modify_start(Operation *op,
 
 	for ( i = 0, ml = op->orm_modlist; ml; i++ ,ml = ml->sml_next )
 		;
-	if (i > 0) {
-		mods = op->o_tmpalloc( sizeof( LDAPMod )*i, op->o_tmpmemctx );
-	}
 
-	if ( mods == NULL ) {
-		rs->sr_err = LDAP_OTHER;
-		retcode = META_SEARCH_ERR;
-		goto doreturn;
-	}
-	modv = ( LDAPMod ** )op->o_tmpalloc( ( i + 1 )*sizeof( LDAPMod * ), op->o_tmpmemctx );
+	modv = op->o_tmpalloc( ( i + 1 )*sizeof( LDAPMod * ) + i*sizeof( LDAPMod ),
+			op->o_tmpmemctx );
 	if ( modv == NULL ) {
 		rs->sr_err = LDAP_OTHER;
 		retcode = META_SEARCH_ERR;
 		goto doreturn;
 	}
+	mods = (LDAPMod *)&modv[ i + 1 ];
 
 	isupdate = be_shadow_update( op );
 	for ( i = 0, ml = op->orm_modlist; ml; ml = ml->sml_next ) {
@@ -224,6 +218,8 @@ done:
 		op->o_tmpfree( mdn.bv_val, op->o_tmpmemctx );
 	}
 
+	op->o_tmpfree( modv, op->o_tmpmemctx );
+
 doreturn:;
 	Debug( LDAP_DEBUG_TRACE, "%s <<< asyncmeta_back_modify_start[%p]=%d\n", op->o_log_prefix, msc, candidates[candidate].sr_msgid );
 	return retcode;
diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c
index 0a78e76..459e835 100644
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -74,18 +74,8 @@ meta_back_modify( Operation *op, SlapReply *rs )
 	for ( i = 0, ml = op->orm_modlist; ml; i++ ,ml = ml->sml_next )
 		;
 
-	mods = ch_malloc( sizeof( LDAPMod )*i );
-	if ( mods == NULL ) {
-		rs->sr_err = LDAP_OTHER;
-		send_ldap_result( op, rs );
-		goto cleanup;
-	}
-	modv = ( LDAPMod ** )ch_malloc( ( i + 1 )*sizeof( LDAPMod * ) );
-	if ( modv == NULL ) {
-		rs->sr_err = LDAP_OTHER;
-		send_ldap_result( op, rs );
-		goto cleanup;
-	}
+	modv = ch_malloc( ( i + 1 )*sizeof( LDAPMod * ) + i*sizeof( LDAPMod ) );
+	mods = (LDAPMod *)&modv[ i + 1 ];
 
 	dc.ctx = "modifyAttrDN";
 	isupdate = be_shadow_update( op );
@@ -206,11 +196,10 @@ cleanup:;
 	}
 	if ( modv != NULL ) {
 		for ( i = 0; modv[ i ]; i++ ) {
-			free( modv[ i ]->mod_bvalues );
+			ch_free( modv[ i ]->mod_bvalues );
 		}
 	}
-	free( mods );
-	free( modv );
+	ch_free( modv );
 
 	if ( mc ) {
 		meta_back_release_conn( mi, mc );
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 15d4a6a..4c4b925 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -5966,7 +5966,7 @@ config_back_add( Operation *op, SlapReply *rs )
 		dopause = 0;
 	if ( op->o_abandon ) {
 		rs->sr_err = SLAPD_ABANDON;
-		goto out;
+		goto unpause;
 	}
 
 	ldap_pvt_thread_rdwr_wlock( &cfb->cb_rwlock );
@@ -6021,10 +6021,11 @@ config_back_add( Operation *op, SlapReply *rs )
 out2:;
 	ldap_pvt_thread_rdwr_wunlock( &cfb->cb_rwlock );
 
-out:;
+unpause:;
 	if ( dopause )
 		slap_unpause_server();
 
+out:;
 	{	int repl = op->o_dont_replicate;
 		if ( rs->sr_err == LDAP_COMPARE_TRUE ) {
 			rs->sr_text = NULL; /* Set after config_add_internal */
@@ -6513,7 +6514,7 @@ config_back_modify( Operation *op, SlapReply *rs )
 			do_pause = 0;
 		if ( op->o_abandon ) {
 			rs->sr_err = SLAPD_ABANDON;
-			goto out;
+			goto unpause;
 		}
 	}
 	ldap_pvt_thread_rdwr_wlock( &cfb->cb_rwlock );
@@ -6549,9 +6550,10 @@ config_back_modify( Operation *op, SlapReply *rs )
 	}
 
 	ldap_pvt_thread_rdwr_wunlock( &cfb->cb_rwlock );
-out:
+unpause:;
 	if ( do_pause )
 		slap_unpause_server();
+out:
 	send_ldap_result( op, rs );
 	slap_graduate_commit_csn( op );
 	return rs->sr_err;
@@ -6694,7 +6696,7 @@ config_back_modrdn( Operation *op, SlapReply *rs )
 		dopause = 0;
 	if ( op->o_abandon ) {
 		rs->sr_err = SLAPD_ABANDON;
-		goto out;
+		goto unpause;
 	}
 
 	ldap_pvt_thread_rdwr_wlock( &cfb->cb_rwlock );
@@ -6765,9 +6767,10 @@ config_back_modrdn( Operation *op, SlapReply *rs )
 
 	ldap_pvt_thread_rdwr_wunlock( &cfb->cb_rwlock );
 
-out:
+unpause:
 	if ( dopause )
 		slap_unpause_server();
+out:
 	send_ldap_result( op, rs );
 	return rs->sr_err;
 }