sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

ntlm_auth: test should honour configfile option to run on build farm.

Browse Source 
(This used to be commit 11c9c1536b)
This commit is contained in:
Kai Blin 2008-01-30 17:57:32 +01:00
parent 582e224af5
commit 5b5d56d84a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/script/tests/test_ntlm_auth_s3.sh
View File

@ -13,9 +13,9 @@ then
exit 0
fi
testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth || failed=`expr $failed + 1`
testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile $CONFFILE || failed=`expr $failed + 1`
# This should work even with NTLMv2
testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile $CONFFILE --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
testok $0 $failed

6
source3/torture/test_ntlm_auth.py
View File

@ -70,6 +70,7 @@ def parseCommandLine():
parser.set_defaults(server_password="secret")
parser.set_defaults(server_domain="FOO")
parser.set_defaults(server_helper="squid-2.5-ntlmssp")
parser.set_defaults(config_file="/etc/samba/smb.conf")
parser.add_option("--client-username", dest="client_username",\
help="User name for the client. [default: foo]")
@ -89,6 +90,9 @@ def parseCommandLine():
parser.add_option("--server-helper", dest="server_helper",\
help="Helper mode for the ntlm_auth server. [default: squid-2.5-server]")
parser.add_option("-s", "--configfile", dest="config_file",\
help="Path to smb.conf file. [default:/etc/samba/smb.conf")
(opts, args) = parser.parse_args()
if len(args) != 1:
parser.error("Invalid number of arguments.")
@ -129,6 +133,7 @@ def main():
client_args.append("--username=%s" % opts.client_username)
client_args.append("--password=%s" % opts.client_password)
client_args.append("--domain=%s" % opts.client_domain)
client_args.append("--configfile=%s" % opts.config_file)
os.execv(ntlm_auth_path, client_args)
@ -161,6 +166,7 @@ def main():
server_args.append("--username=%s" % opts.server_username)
server_args.append("--password=%s" % opts.server_password)
server_args.append("--domain=%s" % opts.server_domain)
server_args.append("--configfile=%s" % opts.config_file)
os.execv(ntlm_auth_path, server_args)