From a345891dddf80d512768b7b181d8657f5b94db6e Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Fri, 16 Dec 2011 15:53:29 +0100 Subject: [PATCH] waf: use the source3 smbclient per default --- selftest/target/Samba3.pm | 3 ++- selftest/wscript | 2 +- source3/selftest/s3-selftest.sh | 4 ++-- source3/selftest/tests.py | 20 ++++++++++---------- source3/wscript_build | 2 +- source4/wscript_build | 2 +- wscript_build | 1 + 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 211bbb6a890..98a495dc229 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1117,7 +1117,8 @@ sub wait_for_start($$) my $count = 0; my $ret; do { - $ret = system(Samba::bindir_path($self, "smbclient3") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139"); + print Samba::bindir_path($self, "smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139\n"; + $ret = system(Samba::bindir_path($self, "smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER} -U% -p 139"); if ($ret != 0) { sleep(2); } diff --git a/selftest/wscript b/selftest/wscript index 67ea5a4ddc1..b0ea7a856a5 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -104,7 +104,7 @@ def cmd_testonly(opt): os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, '')) binary_mapping = ('nmblookup3:nmblookup3,' + - 'smbclient3:smbclient3,' + + 'smbclient:smbclient,' + 'smbtorture4:smbtorture,' + 'ntlm_auth3:ntlm_auth3') diff --git a/source3/selftest/s3-selftest.sh b/source3/selftest/s3-selftest.sh index 0d20324c686..a8ec47a58ae 100755 --- a/source3/selftest/s3-selftest.sh +++ b/source3/selftest/s3-selftest.sh @@ -20,7 +20,7 @@ st_test_done() { if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then ( rm -f ${SELFTESTPREFIX}/st_done && \ ${PERL} ${SELFTESTDIR}/selftest.pl \ - --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,smbclient3:smbclient,ntlm_auth3:ntlm_auth \ + --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,smbclient:smbclient,ntlm_auth3:ntlm_auth \ --prefix=${SELFTESTPREFIX} --target=samba3 \ --testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \ --exclude=${SELFTESTDIR}/skip \ @@ -34,7 +34,7 @@ if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then else ( rm -f ${SELFTESTPREFIX}/st_done && \ ${PERL} ${SELFTESTDIR}/selftest.pl \ - --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,smbclient3:smbclient,ntlm_auth3:ntlm_auth \ + --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,smbclient:smbclient,ntlm_auth3:ntlm_auth \ --prefix=${SELFTESTPREFIX} --target=samba3 \ --testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \ --exclude=${SELFTESTDIR}/skip \ diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 4442f6b5404..308e7040147 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -121,36 +121,36 @@ plantestsuite( plantestsuite("samba3.ntlm_auth.(s3dc:local)", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), configuration]) for env in ["s3dc", "member"]: - plantestsuite("samba3.blackbox.smbclient_auth.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient3'), configuration]) + plantestsuite("samba3.blackbox.smbclient_auth.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient'), configuration]) for env in ["secserver"]: - plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) domain creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN\\\\$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no"]) + plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) domain creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN\\\\$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient'), configuration + " --option=clientntlmv2auth=no"]) for env in ["member"]: - plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER\\\\$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration]) + plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER\\\\$USERNAME', '$PASSWORD', binpath('smbclient'), configuration]) for env in ["maptoguest", "secshare", "secserver"]: - plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) local creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"]) + plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) local creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', binpath('smbclient'), configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"]) env = "maptoguest" -plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) bad username" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', 'notmy$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"]) +plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) bad username" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', 'notmy$USERNAME', '$PASSWORD', binpath('smbclient'), configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"]) # plain for env in ["s3dc"]: - plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration]) + plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient'), binpath('wbinfo'), configuration]) for env in ["member"]: - plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration]) + plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient'), binpath('wbinfo'), configuration]) for env in ["s3dc"]: - plantestsuite("samba3.blackbox.smbclient_s3.sign (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration, "--signing=required"]) + plantestsuite("samba3.blackbox.smbclient_s3.sign (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient'), binpath('wbinfo'), configuration, "--signing=required"]) for env in ["member"]: - plantestsuite("samba3.blackbox.smbclient_s3.sign (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration, "--signing=required"]) + plantestsuite("samba3.blackbox.smbclient_s3.sign (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient'), binpath('wbinfo'), configuration, "--signing=required"]) # encrypted for env in ["s3dc"]: - plantestsuite("samba3.blackbox.smbclient_s3.crypt (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration, "-e"]) + plantestsuite("samba3.blackbox.smbclient_s3.crypt (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient'), binpath('wbinfo'), configuration, "-e"]) #TODO encrypted against member, with member creds, and with DC creds plantestsuite("samba3.blackbox.net.misc", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"), diff --git a/source3/wscript_build b/source3/wscript_build index 4fe432bf501..4ea6db99489 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1171,7 +1171,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient', ''', vars=locals()) -bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, +bld.SAMBA3_BINARY('client/smbclient', source=CLIENT_SRC, deps='''talloc tdb_compat cap popt_samba3 pdb libsmb smbd_shim param wbclient param KRBCLIENT LIBMSRPC_GEN diff --git a/source4/wscript_build b/source4/wscript_build index 47f251e6e56..977a0a2be16 100644 --- a/source4/wscript_build +++ b/source4/wscript_build @@ -1,6 +1,6 @@ #!/usr/bin/env python -bld.SAMBA_BINARY('client/smbclient', +bld.SAMBA_BINARY('client/smbclient' + bld.env.suffix4, source='client/client.c', deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw param_options' ) diff --git a/wscript_build b/wscript_build index 5e0c05c216d..28f12b1f93c 100644 --- a/wscript_build +++ b/wscript_build @@ -8,6 +8,7 @@ srcdir = "." import samba_version bld.env.suffix3 = "3" +bld.env.suffix4 = "4" # create separate build groups for building the asn1 and et compiler, then # building the C from ASN1 and IDL, and finally the main build process -- 2.34.1