[SCM] Samba Shared Repository - branch master updated

[Isaac Boukris]

The branch, master has been updated
       via  cffcc39f185 heimdal_build: Remove bashism from --address-sanitizer build rule
      from  7606800b798 smbd: avoid calling vfs_file_id_from_sbuf() if statinfo is not valid

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


- Log -----------------------------------------------------------------
commit cffcc39f185031bc85bcf0c770892b115058a831
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jan 18 18:35:42 2020 +1000

    heimdal_build: Remove bashism from --address-sanitizer build rule
    
    export FOO=bar is a Bash extension, and is not required in this case, we only need the asn1_compile
    to run under the variable, there are no further commands in this sub-shell.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Isaac Boukris <iboukris at samba.org>
    
    Autobuild-User(master): Isaac Boukris <iboukris at samba.org>
    Autobuild-Date(master): Sat Jan 18 12:25:16 UTC 2020 on sn-devel-184

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

Summary of changes:
 source4/heimdal_build/wscript_build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 7f089677664..e031d9831ff 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -57,16 +57,16 @@ def HEIMDAL_ASN1(name, source,
     # SRC[0].abspath(env) gives the absolute path to the source directory for the first
     # source file. Note that in the case of a option_file, we have more than
     # one source file
-    cd_rule = 'cd "${TGT[0].parent.abspath(env)}"'
+    cd_rule = 'cd "${TGT[0].parent.abspath(env)}" &&'
     env = LOAD_ENVIRONMENT()
     if env.ADDRESS_SANITIZER:
         # If address sanitizer is enabled, we need to suppress leak checking
         # in the asn1 tool.
-        no_leak_check = " && export ASAN_OPTIONS=detect_leaks=0"
+        no_leak_check = " ASAN_OPTIONS=detect_leaks=0"
     else:
         no_leak_check = ""
 
-    asn1_rule = cd_rule + no_leak_check + ' && "${ASN1_COMPILE}" ${OPTION_FILE} ${ASN1OPTIONS} --one-code-file "${SRC[0].abspath(env)}" ${ASN1NAME}'
+    asn1_rule = cd_rule + no_leak_check + ' "${ASN1_COMPILE}" ${OPTION_FILE} ${ASN1OPTIONS} --one-code-file "${SRC[0].abspath(env)}" ${ASN1NAME}'
 
     source = to_list(source)
 


-- 
Samba Shared Repository