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@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Tue Aug  4 06:30:25 UTC 2020 on sn-devel-184

diff --git a/source3/script/tests/test_smbclient_iconv.sh b/source3/script/tests/test_smbclient_iconv.sh
index 0ec7b67dbf703f953b4db3f25abd25ee7a6fa66e..7a3e927e6a9c728211fe5d80d5859c072b943598 100755 (executable)
--- 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