[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  ffdfb78da7f buildtools: Remove compile_commands.json symlink
       via  be4e3bb2fec Add .clangd configuration file
       via  553948ba289 s3:waf: Fix One Definition Rule (ODR) violation of libsecrets3
      from  cfc31bfe11d s3:libsmb: Fix conflicting declaration/implementation

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


- Log -----------------------------------------------------------------
commit ffdfb78da7f5cdabeb06036d0851c83f920e99ea
Author: Andreas Schneider <asn at samba.org>
Date:   Sat Mar 25 17:10:19 2023 +0100

    buildtools: Remove compile_commands.json symlink
    
    We are telling clangd with the .clangd project config file where to find it.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Mar 29 17:54:05 UTC 2023 on atb-devel-224

commit be4e3bb2fec61fd0b9b28174d8dde290edf08587
Author: Andreas Schneider <asn at samba.org>
Date:   Sat Mar 25 17:09:28 2023 +0100

    Add .clangd configuration file
    
    This is supported since clang 11.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 553948ba2896098ce3fe4034d7ea5f30e8a5560e
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Mar 28 14:46:14 2023 +0200

    s3:waf: Fix One Definition Rule (ODR) violation of libsecrets3
    
    ==7109==ERROR: AddressSanitizer: odr-violation (0x7f7d682b4f00):
      [1] size=88 'ndr_table_secrets' source3/librpc/gen_ndr/ndr_secrets.c:1002:34
      [2] size=88 'ndr_table_secrets' source3/librpc/gen_ndr/ndr_secrets.c:1002:34
    These globals were registered at these points:
      [1]:
        #0 0x7f7d6843eda8  (/lib64/libasan.so.8+0x3eda8)
        #1 0x7f7d682970ed in _sub_I_00099_1 (bin/shared/private/libsecrets3-samba4.so+0x1a0ed)
        #2 0x7f7d68af72fd in call_init /usr/src/debug/glibc-2.37/elf/dl-init.c:70
        #3 0x7f7d68af72fd in call_init /usr/src/debug/glibc-2.37/elf/dl-init.c:26
    
      [2]:
        #0 0x7f7d6843eda8  (/lib64/libasan.so.8+0x3eda8)
        #1 0x7f7d65d423fb in _sub_I_00099_1 (bin/shared/private/libndr-samba4.so+0x3423fb)
        #2 0x7f7d68af72fd in call_init /usr/src/debug/glibc-2.37/elf/dl-init.c:70
        #3 0x7f7d68af72fd in call_init /usr/src/debug/glibc-2.37/elf/dl-init.c:26
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 .clangd                     | 3 +++
 buildtools/wafsamba/wscript | 5 -----
 source3/wscript_build       | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 .clangd


Changeset truncated at 500 lines:

diff --git a/.clangd b/.clangd
new file mode 100644
index 00000000000..c505c93e378
--- /dev/null
+++ b/.clangd
@@ -0,0 +1,3 @@
+# https://clangd.llvm.org/config.html
+CompileFlags:
+    CompilationDatabase: bin/default
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 47ed3f71234..30cb366331a 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -720,11 +720,6 @@ struct foo bar = { .y = 'X', .x = 1 };
         conf.DEFINE('FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION', 1)
         conf.env.FUZZ_TARGET_LDFLAGS = Options.options.FUZZ_TARGET_LDFLAGS
 
-    # Create a symlink of the compile db for clangd
-    symlink(os.path.join(conf.bldnode.abspath(), 'default/compile_commands.json'),
-            os.path.join(conf.srcnode.abspath(), 'compile_commands.json'),
-            force=True)
-
     conf.SAMBA_BUILD_ENV()
 
 
diff --git a/source3/wscript_build b/source3/wscript_build
index 4042d8e9c8d..ec63417732c 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -469,7 +469,7 @@ bld.SAMBA3_LIBRARY('secrets3',
                           passdb/secrets_lsa.c
                           ''',
                    deps='''
-                        NDR_SECRETS
+                        ndr-samba4
                         smbconf
                         samba3util
                         dbwrap


-- 
Samba Shared Repository