[SCM] Samba Shared Repository - branch master updated

[Uri Simchoni]

The branch, master has been updated
       via  fc69206f8b8 lib:fuzzing: Fix quoting of --fuzz-target-ldflags
       via  cc3081cebfb s3:utils: Fix format error
      from  2d87e0f6efa s4: process_prefork: Make prefork_restart() use an asynchronous timer event instead of calling sleep(X).

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fc69206f8b8956662e7fc05600e39d2f149a22d9
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Oct 1 09:16:21 2021 +0200

    lib:fuzzing: Fix quoting of --fuzz-target-ldflags
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    Autobuild-User(master): Uri Simchoni <uri at samba.org>
    Autobuild-Date(master): Mon Oct  4 11:36:06 UTC 2021 on sn-devel-184

commit cc3081cebfb65181cd291702cb6a2e727dc999b2
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>

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

Summary of changes:
 lib/fuzzing/oss-fuzz/do_build.sh | 2 +-
 source3/utils/regedit_hexedit.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/fuzzing/oss-fuzz/do_build.sh b/lib/fuzzing/oss-fuzz/do_build.sh
index e00e2251589..159e9579155 100755
--- a/lib/fuzzing/oss-fuzz/do_build.sh
+++ b/lib/fuzzing/oss-fuzz/do_build.sh
@@ -85,7 +85,7 @@ esac
 	    $SANITIZER_ARG \
 	    --disable-warnings-as-errors \
 	    --abi-check-disable \
-	    --fuzz-target-ldflags="-Wl,--disable-new-dtags $LIB_FUZZING_ENGINE" \
+	    "--fuzz-target-ldflags=-Wl,--disable-new-dtags $LIB_FUZZING_ENGINE" \
 	    --nonshared-binary=ALL \
 	    "$@" \
 	    LINK_CC="$CXX"
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