[SCM] Samba Shared Repository - branch master updated

[Samuel Cabrero]

The branch, master has been updated
       via  49a0f6170bf oss-fuzz: Update build script to be compatible with rpm distros
      from  11aac9d0433 smbd: reduce loglevel for failed openat_pathref_fsp() calls

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


- Log -----------------------------------------------------------------
commit 49a0f6170bf6b914bb7d513664c6cfc6b3864bb5
Author: Samuel Cabrero <scabrero at suse.de>
Date:   Tue Mar 30 16:17:31 2021 +0200

    oss-fuzz: Update build script to be compatible with rpm distros
    
    The /etc/default/locale file does not exists in the rpm family distros
    so the do_build.sh script failed with:
    
    ./lib/fuzzing/oss-fuzz/do_build.sh: line 31: /etc/default/locale: No
    such file or directory
    
    Signed-off-by: Samuel Cabrero <scabrero at samba.org>
    Reviewed-by: David Mulder <dmulder at samba.org>
    
    Autobuild-User(master): Samuel Cabrero <scabrero at samba.org>
    Autobuild-Date(master): Tue Apr  6 15:54:54 UTC 2021 on sn-devel-184

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

Summary of changes:
 lib/fuzzing/oss-fuzz/do_build.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/lib/fuzzing/oss-fuzz/do_build.sh b/lib/fuzzing/oss-fuzz/do_build.sh
index f1f830ec34c..4c6796d2350 100755
--- a/lib/fuzzing/oss-fuzz/do_build.sh
+++ b/lib/fuzzing/oss-fuzz/do_build.sh
@@ -28,7 +28,11 @@ set -u
 
 # It is critical that this script, just as the rest of Samba's GitLab
 # CI docker has LANG set to en_US.utf8 (oss-fuzz fails to set this)
-. /etc/default/locale
+if [ -f /etc/default/locale ]; then
+	. /etc/default/locale
+elif [ -f /etc/locale.conf ]; then
+	. /etc/locale.conf
+fi
 export LANG
 export LC_ALL
 


-- 
Samba Shared Repository