Re: RE25 testing call (2.5.17) #1

2024-01-20 Thread Quanah Gibson-Mount 




--On Saturday, January 20, 2024 9:19 PM + Howard Chu  
wrote:

Thanks for the feedback. This was a merge conflict from mdb.master. You
have the correct fix above, and it's now committed in mdb.RE/0.9
5eb93a3b8a3b6139da9321117ea013ea6c95c2c4

The fix will have to be merged to RE25 and RE26 as well.



Thanks for the report Armin, and thanks for the quick fix Howard.  This is 
now updated for RE25, RE26, and master.


Regards,
Quanah

Re: RE25 testing call (2.5.17) #1

2024-01-20 Thread Howard Chu 
Armin Tüting wrote:
> On Fri, 2024-01-19 at 10:27 -0800, Quanah Gibson-Mount wrote:
>> I sent this yesterday, but many people didn't get it due to the
>> mailman 
>> upgrade issue that's now resolved.
>>
>> Thanks!
>>
>> --Quanah
> Compile error in 'ibraries/liblmdb' mdb_load.c
> 
> --- openldap-OPENLDAP_REL_ENG_2_5/libraries/liblmdb/mdb_load.c  2024-
> 01-18 19:42:31.0 +0100
> +++ openldap-2.5.16/libraries/liblmdb/mdb_load.c2024-01-20
> 16:54:45.533564971 +0100
> @@ -449,7 +449,7 @@
> if (rc == MDB_KEYEXIST && putflags)
> continue;
> if (rc) {
> -   fprintf(stderr, "%s: line %"Yu":
> mdb_cursor_put failed, error %d %s\n", prog, lineno, rc,
> mdb_strerror(rc));
> +   fprintf(stderr, "%s: line %" Z "d:
> mdb_cursor_put failed, error %d %s\n", prog, lineno, rc,
> mdb_strerror(rc));
> goto txn_abort;
> }
> batch++;
> 
> ...
> 
> 
Thanks for the feedback. This was a merge conflict from mdb.master. You have the
correct fix above, and it's now committed in mdb.RE/0.9 
5eb93a3b8a3b6139da9321117ea013ea6c95c2c4

The fix will have to be merged to RE25 and RE26 as well.

-- 
  -- Howard Chu
  CTO, Symas Corp.   http://www.symas.com
  Director, Highland Sun http://highlandsun.com/hyc/
  Chief Architect, OpenLDAP  http://www.openldap.org/project/

Re: RE25 testing call (2.5.17) #1

2024-01-20 Thread Armin Tüting 
On Fri, 2024-01-19 at 10:27 -0800, Quanah Gibson-Mount wrote:
> I sent this yesterday, but many people didn't get it due to the
> mailman 
> upgrade issue that's now resolved.
> 
> Thanks!
> 
> --Quanah
Compile error in 'ibraries/liblmdb' mdb_load.c

--- openldap-OPENLDAP_REL_ENG_2_5/libraries/liblmdb/mdb_load.c  2024-
01-18 19:42:31.0 +0100
+++ openldap-2.5.16/libraries/liblmdb/mdb_load.c2024-01-20
16:54:45.533564971 +0100
@@ -449,7 +449,7 @@
if (rc == MDB_KEYEXIST && putflags)
continue;
if (rc) {
-   fprintf(stderr, "%s: line %"Yu":
mdb_cursor_put failed, error %d %s\n", prog, lineno, rc,
mdb_strerror(rc));
+   fprintf(stderr, "%s: line %" Z "d:
mdb_cursor_put failed, error %d %s\n", prog, lineno, rc,
mdb_strerror(rc));
goto txn_abort;
}
batch++;

...