summaryrefslogtreecommitdiff
path: root/source4/torture/ldap
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-08-25 14:31:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:23 -0500
commit8aa051c7b2fa651d284321715f16d94215128abf (patch)
tree91cd43baacfdd5a08ddd345189fef4eecdf307a7 /source4/torture/ldap
parent7eb820d31b39cda74b56c4c2dc66daa768f5216f (diff)
downloadsamba-8aa051c7b2fa651d284321715f16d94215128abf.tar.gz
samba-8aa051c7b2fa651d284321715f16d94215128abf.tar.bz2
samba-8aa051c7b2fa651d284321715f16d94215128abf.zip
r2071: - change smbtorture to use the popt_common stuff
this means -U DOM\\user is know allowed - torture:userdomain is a new smb.conf parameter because lp_workgroup is not the domain of the user - we use torture:userdomain now in the tests instad of lp_workgroup - for backward compat the userdomain is lp_workgroup() by default and not lp_netbios_name(), which my change later to match 'net' and 'smbclient'.. - we now have dublicate options e.g. -N -s ... tridge: can we change this? metze (This used to be commit 4733dcbf5f17422a8a4c9f99664270b3aa66c586)
Diffstat (limited to 'source4/torture/ldap')
-rw-r--r--source4/torture/ldap/basic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c
index 468cacc032..06b703b4ba 100644
--- a/source4/torture/ldap/basic.c
+++ b/source4/torture/ldap/basic.c
@@ -79,7 +79,7 @@ BOOL torture_ldap_basic(int dummy)
BOOL ret = True;
const char *host = lp_parm_string(-1, "torture", "host");
const char *username = lp_parm_string(-1, "torture", "username");
- const char *domain = lp_workgroup();
+ const char *domain = lp_parm_string(-1, "torture", "userdomain");
const char *password = lp_parm_string(-1, "torture", "password");
const char *userdn = lp_parm_string(-1, "torture", "ldap_userdn");
/*const char *basedn = lp_parm_string(-1, "torture", "ldap_basedn");*/