[SCM] Samba Shared Repository - branch v4-15-test updated

Stefan Metzmacher metze at samba.org
Thu Jun 9 15:03:01 UTC 2022


The branch, v4-15-test has been updated
       via  604f94704f3 ldb: version 2.3.4
       via  f3879b3f09d s3:utils: Fix format error
      from  a9e40509704 lib/util/gpfswrap: remove unused gpfswrap_get_winattrs_path()

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-15-test


- Log -----------------------------------------------------------------
commit 604f94704f30e90ef960aa2be62a14d2e614a002
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 9 06:48:14 2022 +0200

    ldb: version 2.3.4
    
    * Fix build problems
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15071
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(v4-15-test): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(v4-15-test): Thu Jun  9 15:02:57 UTC 2022 on sn-devel-184

commit f3879b3f09d288170fb742ef90d52c582e44a58a
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Oct 1 10:46:09 2021 +0200

    s3:utils: Fix format error
    
    regedit_hexedit.c:166:39: error: format ‘%X’ expects argument of type ‘unsigned
    int’, but argument 3 has type ‘size_t’ {aka ‘long unsigned int’}
      166 |                 wprintw(buf->win, "%08X  ", off);
          |                                    ~~~^     ~~~
          |                                       |     |
          |                                       |     size_t {aka long unsigned int}
          |                                       unsigned int
          |                                    %08lX
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    (cherry picked from commit cc3081cebfb65181cd291702cb6a2e727dc999b2)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15091
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 lib/ldb/ABI/{ldb-2.0.5.sigs => ldb-2.4.3.sigs}               | 0
 lib/ldb/ABI/{pyldb-util-2.1.0.sigs => pyldb-util-2.4.3.sigs} | 0
 lib/ldb/wscript                                              | 2 +-
 source3/utils/regedit_hexedit.c                              | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 copy lib/ldb/ABI/{ldb-2.0.5.sigs => ldb-2.4.3.sigs} (100%)
 copy lib/ldb/ABI/{pyldb-util-2.1.0.sigs => pyldb-util-2.4.3.sigs} (100%)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/ABI/ldb-2.0.5.sigs b/lib/ldb/ABI/ldb-2.4.3.sigs
similarity index 100%
copy from lib/ldb/ABI/ldb-2.0.5.sigs
copy to lib/ldb/ABI/ldb-2.4.3.sigs
diff --git a/lib/ldb/ABI/pyldb-util-2.1.0.sigs b/lib/ldb/ABI/pyldb-util-2.4.3.sigs
similarity index 100%
copy from lib/ldb/ABI/pyldb-util-2.1.0.sigs
copy to lib/ldb/ABI/pyldb-util-2.4.3.sigs
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index c470f854b99..312879449e1 100644
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -2,7 +2,7 @@
 
 APPNAME = 'ldb'
 # For Samba 4.15.x
-VERSION = '2.4.2'
+VERSION = '2.4.3'
 
 import sys, os
 
diff --git a/source3/utils/regedit_hexedit.c b/source3/utils/regedit_hexedit.c
index 383736ae2bc..413e563f653 100644
--- a/source3/utils/regedit_hexedit.c
+++ b/source3/utils/regedit_hexedit.c
@@ -163,7 +163,7 @@ void hexedit_refresh(struct hexedit *buf)
 		size_t i, endline;
 
 		wmove(buf->win, lineno, 0);
-		wprintw(buf->win, "%08X  ", off);
+		wprintw(buf->win, "%08zX  ", off);
 
 		endline = BYTES_PER_LINE;
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list