From b947d84c88d1fcc3bdd75f3002bb38b673cbecd3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 24 Feb 2012 12:12:48 +1100 Subject: s3-selftest: run ntlm_auth against winbindd in make test --- source3/torture/test_ntlm_auth.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'source3/torture/test_ntlm_auth.py') diff --git a/source3/torture/test_ntlm_auth.py b/source3/torture/test_ntlm_auth.py index 12a4dae398..b6e06a9bd5 100755 --- a/source3/torture/test_ntlm_auth.py +++ b/source3/torture/test_ntlm_auth.py @@ -89,6 +89,9 @@ def parseCommandLine(): help="Domain server uses for local auth. [default: FOO]") parser.add_option("--server-helper", dest="server_helper",\ help="Helper mode for the ntlm_auth server. [default: squid-2.5-server]") + parser.add_option("--server-use-winbindd", dest="server_use_winbindd",\ + help="Use winbindd to check the password (rather than default username/pw)", action="store_true") + parser.add_option("-s", "--configfile", dest="config_file",\ help="Path to smb.conf file. [default:/etc/samba/smb.conf") @@ -163,9 +166,11 @@ def main(): server_args = [] server_args.append("--helper-protocol=%s" % opts.server_helper) - server_args.append("--username=%s" % opts.server_username) - server_args.append("--password=%s" % opts.server_password) - server_args.append("--domain=%s" % opts.server_domain) + if not opts.server_use_winbindd: + 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) -- cgit