diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-03-28 10:04:30 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-04-09 19:35:38 +0200 |
| commit | 0c6c081dc4e743c142a59d90c9e7f5b6e4cf5bd1 (patch) | |
| tree | a22bb5df4a2120687457e05703048f478d13e7c4 /source4/torture/winbind | |
| parent | 86f29d62a6ebb6c0245c07a9d8e7524ac0b93940 (diff) | |
| download | samba-0c6c081dc4e743c142a59d90c9e7f5b6e4cf5bd1.tar.gz | |
s4:torture/winbind: add torture:winbindd_domain_without_prefix option
We should not assume that names in the domain
specified by 'torture:winbindd_netbios_domain' have no DOMAIN\ prefix.
On an AD DC we prefix all principals.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11183
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Apr 9 19:35:38 CEST 2015 on sn-devel-104
Diffstat (limited to 'source4/torture/winbind')
| -rw-r--r-- | source4/torture/winbind/struct_based.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c index 76e448cd79f..be6ca5145ae 100644 --- a/source4/torture/winbind/struct_based.c +++ b/source4/torture/winbind/struct_based.c @@ -929,8 +929,8 @@ static bool lookup_name_sid_list(struct torture_context *torture, char **list) char *sid; char *name; const char *domain_name = torture_setting_string(torture, - "winbindd_netbios_domain", - lpcfg_workgroup(torture->lp_ctx)); + "winbindd_domain_without_prefix", + NULL); ZERO_STRUCT(req); ZERO_STRUCT(rep); @@ -949,7 +949,9 @@ static bool lookup_name_sid_list(struct torture_context *torture, char **list) DO_STRUCT_REQ_REP(WINBINDD_LOOKUPSID, &req, &rep); - if (strequal(rep.data.name.dom_name, domain_name)) { + if (domain_name != NULL && + strequal(rep.data.name.dom_name, domain_name)) + { name = talloc_asprintf(torture, "%s", rep.data.name.name); } else { |