diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-03-28 08:31:05 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-05-06 01:22:14 +0200 |
| commit | 419910532f13c7966dfbf21f9ac274f07a69f8b5 (patch) | |
| tree | a8c7ae816105b9f3758f8e78ed7431120c10f8bf /source4/selftest | |
| parent | d3f13063cf69e9de569b0487925692ae136fb62b (diff) | |
| download | samba-419910532f13c7966dfbf21f9ac274f07a69f8b5.tar.gz | |
s3:winbindd: don't remove the DOMAIN\ prefix for principals of our own domain as AD DC
This also matches the behaviour of the source4/winbind code.
In Samba 4.0 and 4.1 we had the following
> getent passwd administrator
S4XDOM\Administrator:*:0:100::/home/S4XDOM/Administrator:/bin/false
> getent passwd S4XDOM\\administrator
S4XDOM\Administrator:*:0:100::/home/S4XDOM/Administrator:/bin/false
With Samba 4.2.0 we have:
> getent passwd administrator
administrator:*:0:100::/home/S4XDOM/administrator:/bin/false
> getent passwd S4XDOM\\administrator
administrator:*:0:100::/home/S4XDOM/administrator:/bin/false
With the patches we have:
> getent passwd administrator
S4XDOM\administrator:*:0:100::/home/S4XDOM/administrator:/bin/false
> getent passwd S4XDOM\\administrator
S4XDOM\administrator:*:0:100::/home/S4XDOM/administrator:/bin/false
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11183
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/selftest')
| -rwxr-xr-x | source4/selftest/tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index ad6e1d10384..4855c6bb45d 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -374,7 +374,8 @@ winbind_ad_client_tests = smbtorture4_testsuites("winbind.struct") + smbtorture4 winbind_wbclient_tests = smbtorture4_testsuites("winbind.wbclient") for env in ["ad_dc", "s4member", "ad_member"]: wb_opts = wb_opts_default[:] - wb_opts += ["--option=\"torture:winbindd_domain_without_prefix=$DOMAIN\""] + if env in ["ad_member"]: + wb_opts += ["--option=\"torture:winbindd_domain_without_prefix=$DOMAIN\""] for t in winbind_ad_client_tests: plansmbtorture4testsuite(t, "%s:local" % env, wb_opts + ['//$SERVER/tmp', '--realm=$REALM', '--machine-pass', '--option=torture:addc=$DC_SERVER']) |