summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-02-24 12:12:48 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-24 12:12:48 +1100
commitb947d84c88d1fcc3bdd75f3002bb38b673cbecd3 (patch)
tree3064a55c38017f63f6fa536fb5ed4c9fb54e1b3b /source3/torture
parent111d9f3eb20ad0c3e3b6a7a01f7c997111c660d9 (diff)
downloadsamba-b947d84c88d1fcc3bdd75f3002bb38b673cbecd3.tar.gz
samba-b947d84c88d1fcc3bdd75f3002bb38b673cbecd3.tar.bz2
samba-b947d84c88d1fcc3bdd75f3002bb38b673cbecd3.zip
s3-selftest: run ntlm_auth against winbindd in make test
Diffstat (limited to 'source3/torture')
-rwxr-xr-xsource3/torture/test_ntlm_auth.py11
1 files changed, 8 insertions, 3 deletions
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)