[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  12c526f1513 s3: scripts: Selfttest. samba3.blackbox.smbclient_iconv.*
      from  23274717563 lib: relicense smb_strtoul(l) under LGPLv3

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


- Log -----------------------------------------------------------------
commit 12c526f151372fc9a8eac845e0ad92e6e598bd53
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Aug 3 15:06:03 2020 -0700

    s3: scripts: Selfttest. samba3.blackbox.smbclient_iconv.*
    
    Fix missing 'include' in temporary client smb.conf file.
    
    The current temporary generated smb.conf file for the client, "client_cp850_smbconf"
    doesn't include the normal client smb.conf file "client.conf".
    
    This means it's missing the:
    
    interfaces = XXXX,YYYY
    
    line we needed to find the server via socketwrapper. Currently this test is finding the server by accident :-).
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Tue Aug  4 06:30:25 UTC 2020 on sn-devel-184

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

Summary of changes:
 source3/script/tests/test_smbclient_iconv.sh | 2 ++
 1 file changed, 2 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_smbclient_iconv.sh b/source3/script/tests/test_smbclient_iconv.sh
index 0ec7b67dbf7..7a3e927e6a9 100755
--- a/source3/script/tests/test_smbclient_iconv.sh
+++ b/source3/script/tests/test_smbclient_iconv.sh
@@ -26,9 +26,11 @@ failed=0
 
 test_smbclient_iconv()
 {
+    normal_smbclient_config="$PREFIX/client/client.conf"
     smbclient_config="$PREFIX/client/client_cp850_smbconf"
     cat > $smbclient_config <<EOF
 [global]
+    include = $normal_smbclient_config
     unix charset = cp850
     client min protocol = core
 EOF


-- 
Samba Shared Repository