[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Mar 16 18:47:04 MDT 2015
The branch, master has been updated
via f212143 selftest: rename env member to nt4_member
via 0607148 selftest: rename env s3dc_schannel to nt4_dc_schannel
via c157baa selftest: rename env s3dc to nt4_dc
via 10afe88 selftest: rename env s3member_rfc2307 to ad_member_rfc2307
via 25f9ebf selftest: rename env s3member to ad_member.
via 3de5abb selftest: rename env dc to ad_dc_ntvfs
via 902aa3c selftest: rename env plugin_s4_dc to ad_dc
via 64738c3 selftest: make blackbox.pkinit test independent of test environment.
via 32206b0 selftest: make blackbox.ktpass test independent of test environment.
via 7293767 selftest: make blackbox.passwords test independent of test environment.
via 0bcea51 selftest:test_kinit: remove commented out line with outdated content.
from 71a97c9 doc: fix the idmap_script manpage to be named idmap_script
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f212143abc58c896eb406c1356715b78a52ab97b
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 6 10:01:33 2015 +0100
selftest: rename env member to nt4_member
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Tue Mar 17 01:46:18 CET 2015 on sn-devel-104
commit 0607148154114c56aa4a54daeedbd865e7823062
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 6 09:39:54 2015 +0100
selftest: rename env s3dc_schannel to nt4_dc_schannel
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit c157baa4b9b62d22004408d3dd2cc860c32e9771
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 6 09:34:11 2015 +0100
selftest: rename env s3dc to nt4_dc
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 10afe88e44fbf9f09e6f058961a6797a6c7b3993
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 6 00:58:45 2015 +0100
selftest: rename env s3member_rfc2307 to ad_member_rfc2307
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 25f9ebf270648ee6c8bcc795d5a724e9920f8a6f
Author: Michael Adam <obnox at samba.org>
Date: Thu Mar 5 23:46:14 2015 +0100
selftest: rename env s3member to ad_member.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3de5abb954e8fb5e947390bde4a6d5e95fbc8d28
Author: Michael Adam <obnox at samba.org>
Date: Thu Mar 5 23:38:26 2015 +0100
selftest: rename env dc to ad_dc_ntvfs
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 902aa3c7102b8fb7284361e9388f2d465e9782bc
Author: Michael Adam <obnox at samba.org>
Date: Thu Mar 5 18:08:43 2015 +0100
selftest: rename env plugin_s4_dc to ad_dc
This is the environment that represents our supported production
setup of an active directory domain controller.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 64738c3206ef42c85299790b4485a20c294fb0f2
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 16 10:37:35 2015 +0100
selftest: make blackbox.pkinit test independent of test environment.
This lets the test not clutter the main selftest prefix directory
with temporary data.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 32206b045b3a9940f62066bc275e0434ecd086e6
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 16 10:34:37 2015 +0100
selftest: make blackbox.ktpass test independent of test environment.
This also prevents the test from cluttering the main
selftest prefix directory with temporary data.
Note: this test is currently skipped but it should
be adapted because of the environment renames anyways.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 7293767a8b1a87aad8bb2b536de8a28dfac2f866
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 16 10:27:56 2015 +0100
selftest: make blackbox.passwords test independent of test environment.
This also prevents the test from cluttering the main
selftest directort with temporary data.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0bcea51507547e867af28be5d864e9e294160fc7
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 16 10:20:01 2015 +0100
selftest:test_kinit: remove commented out line with outdated content.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
python/samba/netcmd/ntacl.py | 2 +-
python/samba/tests/dsdb.py | 2 +-
python/samba/tests/posixacl.py | 8 +-
python/samba/tests/upgradeprovisionneeddc.py | 2 +-
selftest/flapping | 14 +-
selftest/knownfail | 206 +++++++++++++--------------
selftest/selftest.pl | 4 +-
selftest/selftest.py | 2 +-
selftest/skip | 4 +-
selftest/target/Samba.pm | 8 +-
selftest/target/Samba3.pm | 64 ++++-----
selftest/target/Samba4.pm | 92 ++++++------
selftest/target/samba.py | 6 +-
selftest/tests.py | 2 +-
source3/selftest/tests.py | 200 +++++++++++++-------------
source4/scripting/devel/selftest-vars.sh | 12 +-
source4/selftest/tests.py | 194 ++++++++++++-------------
testprogs/blackbox/test_kinit.sh | 1 -
testprogs/blackbox/test_ktpass.sh | 2 +-
testprogs/blackbox/test_passwords.sh | 6 +-
testprogs/blackbox/test_pkinit.sh | 6 +-
21 files changed, 418 insertions(+), 419 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/ntacl.py b/python/samba/netcmd/ntacl.py
index 6d4d350..dff1550 100644
--- a/python/samba/netcmd/ntacl.py
+++ b/python/samba/netcmd/ntacl.py
@@ -199,7 +199,7 @@ class cmd_ntacl_sysvolreset(Command):
s4_passdb = passdb.PDB(s3conf.get("passdb backend"))
- # These assertions correct for current plugin_s4_dc selftest
+ # These assertions correct for current ad_dc selftest
# configuration. When other environments have a broad range of
# groups mapped via passdb, we can relax some of these checks
(LA_uid,LA_type) = s4_passdb.sid_to_id(LA_sid)
diff --git a/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py
index 3aef1d2..f19853f 100644
--- a/python/samba/tests/dsdb.py
+++ b/python/samba/tests/dsdb.py
@@ -41,7 +41,7 @@ class DsdbTests(TestCase):
session_info=self.session, credentials=self.creds,lp=self.lp)
def baseprovpath(self):
- return os.path.join(os.environ['SELFTEST_PREFIX'], "dc")
+ return os.path.join(os.environ['SELFTEST_PREFIX'], "ad_dc_ntvfs")
def test_get_oid_from_attrid(self):
oid = self.samdb.get_oid_from_attid(591614)
diff --git a/python/samba/tests/posixacl.py b/python/samba/tests/posixacl.py
index d8c0fcd..40632f4 100644
--- a/python/samba/tests/posixacl.py
+++ b/python/samba/tests/posixacl.py
@@ -330,7 +330,7 @@ class PosixAclMappingTests(TestCaseInTempDir):
s4_passdb = passdb.PDB(self.lp.get("passdb backend"))
- # These assertions correct for current plugin_s4_dc selftest
+ # These assertions correct for current ad_dc selftest
# configuration. When other environments have a broad range of
# groups mapped via passdb, we can relax some of these checks
(LA_uid,LA_type) = s4_passdb.sid_to_id(LA_sid)
@@ -470,7 +470,7 @@ class PosixAclMappingTests(TestCaseInTempDir):
s4_passdb = passdb.PDB(self.lp.get("passdb backend"))
- # These assertions correct for current plugin_s4_dc selftest
+ # These assertions correct for current ad_dc selftest
# configuration. When other environments have a broad range of
# groups mapped via passdb, we can relax some of these checks
(LA_uid,LA_type) = s4_passdb.sid_to_id(LA_sid)
@@ -564,7 +564,7 @@ class PosixAclMappingTests(TestCaseInTempDir):
s4_passdb = passdb.PDB(self.lp.get("passdb backend"))
- # These assertions correct for current plugin_s4_dc selftest
+ # These assertions correct for current ad_dc selftest
# configuration. When other environments have a broad range of
# groups mapped via passdb, we can relax some of these checks
(LA_uid,LA_type) = s4_passdb.sid_to_id(LA_sid)
@@ -677,7 +677,7 @@ class PosixAclMappingTests(TestCaseInTempDir):
s4_passdb = passdb.PDB(self.lp.get("passdb backend"))
- # These assertions correct for current plugin_s4_dc selftest
+ # These assertions correct for current ad_dc selftest
# configuration. When other environments have a broad range of
# groups mapped via passdb, we can relax some of these checks
(LA_uid,LA_type) = s4_passdb.sid_to_id(LA_sid)
diff --git a/python/samba/tests/upgradeprovisionneeddc.py b/python/samba/tests/upgradeprovisionneeddc.py
index a7cb298..bf25453 100644
--- a/python/samba/tests/upgradeprovisionneeddc.py
+++ b/python/samba/tests/upgradeprovisionneeddc.py
@@ -40,7 +40,7 @@ import ldb
def dummymessage(a=None, b=None):
pass
-smb_conf_path = "%s/%s/%s" % (os.environ["SELFTEST_PREFIX"], "dc", "etc/smb.conf")
+smb_conf_path = "%s/%s/%s" % (os.environ["SELFTEST_PREFIX"], "ad_dc_ntvfs", "etc/smb.conf")
class UpgradeProvisionBasicLdbHelpersTestCase(TestCaseInTempDir):
"""Some simple tests for individual functions in the provisioning code.
diff --git a/selftest/flapping b/selftest/flapping
index 4ad29af..f039004 100644
--- a/selftest/flapping
+++ b/selftest/flapping
@@ -17,11 +17,11 @@
^samba3.rpc.spoolss.printer.*addprinter.print_test # fails on some hosts due to timing issues ?
^samba3.rpc.spoolss.printer.addprinter.print_job_enum # fails on some hosts due to bug 10930
^samba3.rpc.spoolss.printer.addprinterex.print_job_enum # fails on some hosts due to bug 10930
-^samba3.rpc.lsa.privileges.lsa.Privileges\(s3dc\) # fails sometimes on sn-devel
+^samba3.rpc.lsa.privileges.lsa.Privileges\(nt4_dc\) # fails sometimes on sn-devel
^samba4.blackbox.gentest # is flakey due to timing
-^samba3.smb2.acls.INHERITANCE\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
-^samba3.smb2.acls.DYNAMIC\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
-^samba3.raw.acls.dynamic\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
-^samba3.raw.acls.inheritance\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
-^samba3.raw.samba3checkfsp.samba3checkfsp\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
-^samba3.raw.samba3closeerr.samba3closeerr\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.smb2.acls.INHERITANCE\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.smb2.acls.DYNAMIC\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.raw.acls.dynamic\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.raw.acls.inheritance\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.raw.samba3checkfsp.samba3checkfsp\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
+^samba3.raw.samba3closeerr.samba3closeerr\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
diff --git a/selftest/knownfail b/selftest/knownfail
index 64fc2cd..598fb4d 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -6,56 +6,56 @@
^samba3.blackbox.failure.failure # this is designed to fail, for testing our test infrastructure
.*driver.add_driver_timestamps # we only can store dates, not timestamps
-^samba3.smbtorture_s3.plain\(dc\).LOCK9 # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).OPLOCK2 # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).STREAMERROR # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).DIR1 # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).DIR-CREATETIME # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).DELETE-LN # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).POSIX # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).UID-REGRESSION-TEST # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).SHORTNAME-TEST # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).POSIX-APPEND # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).NTTRANS-FSCTL # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).SMB2-NEGPROT # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).BAD-NBT-SESSION # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).SMB2-SESSION-REAUTH # Fails against the s4 ntvfs server
-^samba3.smbtorture_s3.plain\(dc\).SMB2-SESSION-RECONNECT # Fails against the s4 ntvfs server
- ^samba3.smbtorture_s3.crypt_server\(s3dc\).SMB2-SESSION-REAUTH # expected to give ACCESS_DENIED SMB2.1 doesn't have encryption
-^samba3.smbtorture_s3.crypt_server\(s3dc\).SMB2-SESSION-RECONNECT # expected to give CONNECTION_DISCONNECTED, we need to fix the test
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).LOCK9 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).OPLOCK2 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).STREAMERROR # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).DIR1 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).DIR-CREATETIME # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).DELETE-LN # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).POSIX # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).UID-REGRESSION-TEST # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).SHORTNAME-TEST # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).POSIX-APPEND # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).NTTRANS-FSCTL # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).SMB2-NEGPROT # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).BAD-NBT-SESSION # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).SMB2-SESSION-REAUTH # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).SMB2-SESSION-RECONNECT # Fails against the s4 ntvfs server
+ ^samba3.smbtorture_s3.crypt_server\(nt4_dc\).SMB2-SESSION-REAUTH # expected to give ACCESS_DENIED SMB2.1 doesn't have encryption
+^samba3.smbtorture_s3.crypt_server\(nt4_dc\).SMB2-SESSION-RECONNECT # expected to give CONNECTION_DISCONNECTED, we need to fix the test
^samba3.smb2.session enc.reconnect # expected to give CONNECTION_DISCONNECTED, we need to fix the test
^samba3.raw.session enc # expected to give ACCESS_DENIED as SMB1 encryption isn't used
^samba3.smbtorture_s3.crypt_server # expected to give ACCESS_DENIED as SMB1 encryption isn't used
-^samba3.nbt.dgram.*netlogon2\(s3dc\)
+^samba3.nbt.dgram.*netlogon2\(nt4_dc\)
^samba3.*rap.sam.*.useradd # Not provided by Samba 3
^samba3.*rap.sam.*.userdelete # Not provided by Samba 3
^samba3.libsmbclient.opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered
# see bug 8412
^samba3.smb2.rename.*.simple_nodelete
^samba3.smb2.rename.*.no_share_delete_no_delete_access
-^samba3.blackbox.smbclient_machine_auth.plain \(s3dc:local\)# the S3dc does not currently set up a self-join
-^samba3.raw.samba3hide.samba3hide\((s3dc|plugin_s4_dc)\) # This test fails against an smbd environment with NT ACLs enabled
-^samba3.raw.samba3closeerr.samba3closeerr\(s3dc\) # This test fails against an smbd environment with NT ACLs enabled
-^samba3.raw.acls nfs4acl_xattr-simple.INHERITFLAGS\(s3dc\) # This (and the follow nfs4acl_xattr tests fail because our NFSv4 backend isn't a complete mapping yet.
-^samba3.raw.acls nfs4acl_xattr-simple.sd\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-simple.create_file\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-simple.create_dir\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-simple.nulldacl\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-simple.generic\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-simple.inheritance\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-special.INHERITFLAGS\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-special.sd\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-special.create_file\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-special.create_dir\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-special.nulldacl\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-special.generic\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-special.inheritance\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_owner\(s3dc\)
-^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_group\(s3dc\)
+^samba3.blackbox.smbclient_machine_auth.plain \(nt4_dc:local\)# the NT4 DC does not currently set up a self-join
+^samba3.raw.samba3hide.samba3hide\((nt4_dc|ad_dc)\) # This test fails against an smbd environment with NT ACLs enabled
+^samba3.raw.samba3closeerr.samba3closeerr\(nt4_dc\) # This test fails against an smbd environment with NT ACLs enabled
+^samba3.raw.acls nfs4acl_xattr-simple.INHERITFLAGS\(nt4_dc\) # This (and the follow nfs4acl_xattr tests fail because our NFSv4 backend isn't a complete mapping yet.
+^samba3.raw.acls nfs4acl_xattr-simple.sd\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-simple.create_file\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-simple.create_dir\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-simple.nulldacl\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-simple.generic\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-simple.inheritance\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-special.INHERITFLAGS\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-special.sd\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-special.create_file\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-special.create_dir\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-special.nulldacl\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-special.generic\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-special.inheritance\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_owner\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_group\(nt4_dc\)
^samba3.base.delete.deltest16a
^samba3.base.delete.deltest17a
-^samba3.unix.whoami anonymous connection.whoami\(plugin_s4_dc\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token
-^samba3.unix.whoami anonymous connection.whoami\(s3member\) # smbd maps anonymous logins to domain guest in the local domain, not SID_NT_ANONYMOUS
+^samba3.unix.whoami anonymous connection.whoami\(ad_dc\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token
+^samba3.unix.whoami anonymous connection.whoami\(ad_member\) # smbd maps anonymous logins to domain guest in the local domain, not SID_NT_ANONYMOUS
# these show that we still have some differences between our system
# with our internal iconv because it passes except when we bypass our
# internal iconv modules
@@ -111,7 +111,7 @@
^samba4.smb2.rename.share_delete_no_delete_access\(.*\)$
^samba4.smb2.rename.no_share_delete_no_delete_access\(.*\)$
^samba4.smb2.rename.msword
-^samba4.smb2.rename.rename_dir_bench\(dc\)
+^samba4.smb2.rename.rename_dir_bench\(ad_dc_ntvfs\)
^samba4.smb2.rename.rename_dir_openfile\(.*\)$
^samba4.smb2.oplock.doc
^samba4.smb2.compound.related3
@@ -124,7 +124,7 @@
^samba4.*base.delaywrite.*update of write time using SET_END_OF_FILE\(.*\)$
^samba4.*base.delaywrite.*update of write time using SET_ALLOCATION_SIZE\(.*\)$
^samba4.*base.delaywrite.*directory timestamp update test\(.*\)$
-^samba4.ldap.python \(dc\).Test add_ldif\(\) with BASE64 security descriptor input using WRONG domain SID\(.*\)$
+^samba4.ldap.python \(ad_dc_ntvfs\).Test add_ldif\(\) with BASE64 security descriptor input using WRONG domain SID\(.*\)$
# some operations don't work over the CIFS NTVFS backend yet (eg. root_fid)
^samba4.ntvfs.cifs.*.base.createx_sharemodes_dir
^samba4.raw.lock.*.async # bug 6960
@@ -149,8 +149,8 @@
^samba4.smb2.acls.*.generic
^samba4.smb2.acls.*.inheritflags
^samba4.smb2.acls.*.owner
-^samba4.ldap.dirsync.python.dc..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
-#^samba4.ldap.dirsync.python.dc..__main__.ExtendedDirsyncTests.*
+^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
+#^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.*
^samba4.libsmbclient.opendir.opendir # This requires netbios browsing
^samba4.rpc.drsuapi.*.drsuapi.DsGetDomainControllerInfo\(.*\)$
^samba4.smb2.oplock.exclusive2\(.*\)$ # samba 4 oplocks are a mess
@@ -182,7 +182,7 @@
^samba4.blackbox.upgradeprovision.alpha13.ldapcmp_sd\(none\) # Due to something rewriting the NT ACL on DNS objects
^samba4.blackbox.upgradeprovision.alpha13.ldapcmp_full_sd\(none\) # Due to something rewriting the NT ACL on DNS objects
^samba4.blackbox.upgradeprovision.release-4-0-0.ldapcmp_sd\(none\) # Due to something rewriting the NT ACL on DNS objects
-^samba4.raw.read.readx\(dc\) # fails readx 16bit alignment requirement
+^samba4.raw.read.readx\(ad_dc_ntvfs\) # fails readx 16bit alignment requirement
^samba3.smb2.create.gentest
^samba3.smb2.create.blob
^samba3.smb2.create.open
@@ -191,8 +191,8 @@
^samba3.smb2.notify.rec
^samba3.smb2.durable-open.delete_on_close2
^samba3.smb2.durable-v2-open.app-instance
-^samba4.smb2.ioctl.req_resume_key\(dc\) # not supported by s4 ntvfs server
-^samba4.smb2.ioctl.copy_chunk_\w*\(dc\) # not supported by s4 ntvfs server
+^samba4.smb2.ioctl.req_resume_key\(ad_dc_ntvfs\) # not supported by s4 ntvfs server
+^samba4.smb2.ioctl.copy_chunk_\w*\(ad_dc_ntvfs\) # not supported by s4 ntvfs server
^samba3.smb2.dir.one
^samba3.smb2.dir.modify
^samba3.smb2.oplock.batch20
@@ -211,56 +211,56 @@
^samba3.smb2.replay.replay4
^samba3.smb2.lock.*replay
^samba3.raw.session.*reauth2 # maybe fix this?
-^samba3.rpc.samr.passwords.badpwdcount.samr.badPwdCount\(s3dc\) # We fail this test currently
-^samba3.rpc.samr.passwords.lockout.*\(s3dc\)$ # We fail this test currently
+^samba3.rpc.samr.passwords.badpwdcount.samr.badPwdCount\(nt4_dc\) # We fail this test currently
+^samba3.rpc.samr.passwords.lockout.*\(nt4_dc\)$ # We fail this test currently
^samba3.rpc.spoolss.printer.addprinter.driver_info_winreg # knownfail or flapping?
^samba3.rpc.spoolss.printer.addprinterex.driver_info_winreg # knownfail or flapping?
^samba3.rpc.spoolss.printer.*.publish_toggle\(.*\)$ # needs spoolss AD member env
^samba3.rpc.spoolss.printserver.*.add_processor\(.*\)$
#
-# The following tests fail against plugin_s4_dc (aka s3fs) currently.
+# The following tests fail against ad_dc (aka s3fs) currently.
# These need to be examined and either fixed or correctly categorised.
# but in the interests of ensuring we do not regress, we run the tests
# and list the current failures here.
#
-^samba3.rpc.eventlog.eventlog.GetLogIntormation\(plugin_s4_dc\)
-^samba3.rpc.eventlog.eventlog.FlushEventLog\(plugin_s4_dc\)
-^samba3.rpc.eventlog.eventlog.ReportEventLog\(plugin_s4_dc\)
-^samba3.rpc.eventlog.eventlog.ReadEventLog\(plugin_s4_dc\)
-^samba3.rpc.eventlog.eventlog.GetNumRecords\(plugin_s4_dc\)
-^samba3.rpc.eventlog.eventlog.OpenEventLog\(plugin_s4_dc\)
-^samba3.rap.basic.netsessiongetinfo\(plugin_s4_dc\)
+^samba3.rpc.eventlog.eventlog.GetLogIntormation\(ad_dc\)
+^samba3.rpc.eventlog.eventlog.FlushEventLog\(ad_dc\)
+^samba3.rpc.eventlog.eventlog.ReportEventLog\(ad_dc\)
+^samba3.rpc.eventlog.eventlog.ReadEventLog\(ad_dc\)
+^samba3.rpc.eventlog.eventlog.GetNumRecords\(ad_dc\)
+^samba3.rpc.eventlog.eventlog.OpenEventLog\(ad_dc\)
+^samba3.rap.basic.netsessiongetinfo\(ad_dc\)
#
# The Samba4 netlogon server does not implement these LogonControl operations
#
-^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(plugin_s4_dc\)
-^samba3.rpc.netlogon.admin.netlogon.LogonControl\(plugin_s4_dc\)
-^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(plugin_s4_dc\)
-^samba3.rpc.netlogon.admin.netlogon.LogonControl\(plugin_s4_dc\)
-^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(plugin_s4_dc\)
-^samba3.rpc.netlogon.admin.netlogon.LogonControl\(plugin_s4_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(ad_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl\(ad_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(ad_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl\(ad_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(ad_dc\)
+^samba3.rpc.netlogon.admin.netlogon.LogonControl\(ad_dc\)
#
# The Samba4 winbind does not cover the full winbind protocol, so these are expected
#
-^samba4.winbind.struct.show_sequence\(plugin_s4_dc\)
-^samba.blackbox.wbinfo\(dc:local\).wbinfo -N against dc
-^samba.blackbox.wbinfo\(dc:local\).wbinfo -I against dc
-^samba.blackbox.wbinfo\(dc:local\).wbinfo --trusted-domains against dc
-^samba.blackbox.wbinfo\(dc:local\).wbinfo --all-domains against dc
+^samba4.winbind.struct.show_sequence\(ad_dc\)
+^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo -N against ad_dc_ntvfs
+^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo -I against ad_dc_ntvfs
+^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo --trusted-domains against ad_dc_ntvfs
+^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo --all-domains against ad_dc_ntvfs
#
# This makes less sense when not running against an AD DC
#
-^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U against s3member
-^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G against s3member
-^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U check for sane mapping
-^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G check for sane mapping
-^samba4.winbind.struct.show_sequence\(dc\)
-^samba.wbinfo_simple.\(dc:local\).--allocate-uid
-^samba.wbinfo_simple.\(dc:local\).--allocate-gid
+^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -U against ad_member
+^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G against ad_member
+^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -U check for sane mapping
+^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G check for sane mapping
+^samba4.winbind.struct.show_sequence\(ad_dc_ntvfs\)
+^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--allocate-uid
+^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--allocate-gid
^samba.wbinfo_simple.\(s4member:local\).--allocate-uid
^samba.wbinfo_simple.\(s4member:local\).--allocate-gid
-^samba.wbinfo_simple.\(plugin_s4_dc:local\).--allocate-uid
-^samba.wbinfo_simple.\(plugin_s4_dc:local\).--allocate-gid
+^samba.wbinfo_simple.\(ad_dc:local\).--allocate-uid
+^samba.wbinfo_simple.\(ad_dc:local\).--allocate-gid
#
# These do not work against winbindd in member mode for unknown reasons
#
@@ -269,47 +269,47 @@
^samba4.winbind.struct.lookup_name_sid\(s4member:local\)
^samba.blackbox.wbinfo\(s4member:local\).wbinfo -r against s4member\(s4member:local\)
^samba.blackbox.wbinfo\(s4member:local\).wbinfo --user-sids against s4member\(s4member:local\)
-^samba4.winbind.struct.getpwent\(plugin_s4_dc:local\)
+^samba4.winbind.struct.getpwent\(ad_dc:local\)
^samba.wbinfo_simple.\(s4member:local\).--user-groups
^samba.nss.test using winbind\(s4member:local\)
#
-# These fail since dc assigns the local user's uid to SAMBADOMAIN/Administrator
+# These fail since ad_dc_ntvfs assigns the local user's uid to SAMBADOMAIN/Administrator
# hence we have a duplicate UID in nsswitch.
#
-^samba3.local.nss.reentrant enumeration crosschecks\(dc:local\)
-^samba3.local.nss.reentrant enumeration\(dc:local\)
-^samba3.local.nss.enumeration\(dc:local\)
+^samba3.local.nss.reentrant enumeration crosschecks\(ad_dc_ntvfs:local\)
+^samba3.local.nss.reentrant enumeration\(ad_dc_ntvfs:local\)
+^samba3.local.nss.enumeration\(ad_dc_ntvfs:local\)
#
# These fail only if we run the unix.whoami test before them
-# in the member and s3member environments. ==> Strange!!!
+# in the member and ad_member environments. ==> Strange!!!
#
-^samba3.local.nss.reentrant enumeration crosschecks\(s3member:local\)
-^samba3.local.nss.reentrant enumeration\(s3member:local\)
-^samba3.local.nss.enumeration\(s3member:local\)
+^samba3.local.nss.reentrant enumeration crosschecks\(ad_member:local\)
+^samba3.local.nss.reentrant enumeration\(ad_member:local\)
+^samba3.local.nss.enumeration\(ad_member:local\)
#
# These just happen to fail for some reason (probably because they run against the s4 winbind)
#
-^samba4.winbind.struct.getdcname\(s3member:local\)
-^samba4.winbind.struct.lookup_name_sid\(s3member:local\)
-^samba.wbinfo_simple.\(dc:local\).--all-domains.wbinfo\(dc:local\)
-^samba.wbinfo_simple.\(dc:local\).--trusted-domains.wbinfo\(dc:local\)
-^samba.wbinfo_simple.\(dc:local\).--online-status.wbinfo\(dc:local\)
-^samba.wbinfo_simple.\(dc:local\).--online-status --domain=BUILTIN.wbinfo\(dc:local\)
-^samba.wbinfo_simple.\(dc:local\).--online-status --domain=SAMBADOMAIN.wbinfo\(dc:local\)
-^samba.wbinfo_simple.\(dc:local\).--change-secret --domain=SAMBADOMAIN.wbinfo\(dc:local\)
-^samba.wbinfo_simple.\(dc:local\).--online-status --domain=SAMBADOMAIN.wbinfo\(dc:local\)
-^samba.blackbox.wbinfo\(dc:local\).wbinfo -I against dc\(dc:local\)
-^samba.blackbox.wbinfo\(dc:local\).wbinfo --trusted-domains against dc\(dc:local\)
-^samba.blackbox.wbinfo\(dc:local\).wbinfo --all-domains against dc\(dc:local\)
+^samba4.winbind.struct.getdcname\(ad_member:local\)
+^samba4.winbind.struct.lookup_name_sid\(ad_member:local\)
+^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--all-domains.wbinfo\(ad_dc_ntvfs:local\)
+^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--trusted-domains.wbinfo\(ad_dc_ntvfs:local\)
+^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--online-status.wbinfo\(ad_dc_ntvfs:local\)
+^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--online-status --domain=BUILTIN.wbinfo\(ad_dc_ntvfs:local\)
+^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--online-status --domain=SAMBADOMAIN.wbinfo\(ad_dc_ntvfs:local\)
+^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--change-secret --domain=SAMBADOMAIN.wbinfo\(ad_dc_ntvfs:local\)
+^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--online-status --domain=SAMBADOMAIN.wbinfo\(ad_dc_ntvfs:local\)
+^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo -I against ad_dc_ntvfs\(ad_dc_ntvfs:local\)
+^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo --trusted-domains against ad_dc_ntvfs\(ad_dc_ntvfs:local\)
+^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo --all-domains against ad_dc_ntvfs\(ad_dc_ntvfs:local\)
#
# These do not work against winbindd in member mode for unknown reasons
#
-^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U against s3member\(s3member:local\)
-^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U check for sane mapping\(s3member:local\)
-^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G against s3member\(s3member:local\)
-^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G check for sane mapping\(s3member:local\)
-^samba.ntlm_auth.\(dc:local\).ntlm_auth against winbindd with failed require-membership-of
-^samba.ntlm_auth.\(dc:local\).ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server against winbind with failed require-membership-of
+^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -U against ad_member\(ad_member:local\)
+^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -U check for sane mapping\(ad_member:local\)
+^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G against ad_member\(ad_member:local\)
+^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G check for sane mapping\(ad_member:local\)
+^samba.ntlm_auth.\(ad_dc_ntvfs:local\).ntlm_auth against winbindd with failed require-membership-of
+^samba.ntlm_auth.\(ad_dc_ntvfs:local\).ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server against winbind with failed require-membership-of
#
# Differences in our KDC compared to windows
#
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index c9b4818..1b22d61 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -435,11 +435,11 @@ if (defined($ENV{SMBD_MAXTIME}) and $ENV{SMBD_MAXTIME} ne "") {
unless ($opt_list) {
if ($opt_target eq "samba") {
- $testenv_default = "dc";
+ $testenv_default = "ad_dc_ntvfs";
require target::Samba;
$target = new Samba($bindir, \%binary_mapping, $ldap, $srcdir, $server_maxtime);
} elsif ($opt_target eq "samba3") {
- $testenv_default = "member";
+ $testenv_default = "nt4_member";
require target::Samba3;
$target = new Samba3($bindir, \%binary_mapping, $srcdir_abs, $server_maxtime);
}
diff --git a/selftest/selftest.py b/selftest/selftest.py
index 94e1096..ec6f89c 100755
--- a/selftest/selftest.py
+++ b/selftest/selftest.py
@@ -265,7 +265,7 @@ if not opts.list:
if opts.socket_wrapper and not has_socket_wrapper(opts.bindir):
sys.stderr.write("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....\n")
sys.exit(1)
- testenv_default = "dc"
+ testenv_default = "ad_dc_ntvfs"
from selftest.target.samba import Samba
target = Samba(opts.bindir, binary_mapping, ldap, opts.srcdir, server_maxtime)
elif opts.target == "samba3":
diff --git a/selftest/skip b/selftest/skip
index d1ee808..ffb138c 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -44,7 +44,7 @@
^samba3.smb2.durable-open-disconnect # Not a test, but a way to create a disconnected durable
^samba3.smb2.scan # No tests
^samba3.smb2.oplock.levelii501 # No test yet
-^samba3.rpc.samr.passwords.lockout\(plugin_s4_dc\) # No point running this version, it just waits 12 times longer the samba4 version of this test, covering the same code
+^samba3.rpc.samr.passwords.lockout\(ad_dc\) # No point running this version, it just waits 12 times longer the samba4 version of this test, covering the same code
^samba4.base.iometer
^samba4.base.casetable
^samba4.base.nttrans
@@ -53,7 +53,7 @@
^samba4.smb2.hold-oplock # Not a test, but a way to block other clients for a test
^samba4.raw.ping.pong # Needs second server to test
^samba4.rpc.samr.accessmask
-^samba4.rpc.samr.passwords.*ncacn_np\(dc\) # currently fails, possibly config issue
+^samba4.rpc.samr.passwords.*ncacn_np\(ad_dc_ntvfs\) # currently fails, possibly config issue
^samba4.rpc.samr.passwords.*s4member # currently fails, possibly config issue
^samba4.raw.scan.eamax
^samba4.smb2.notify
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 47bc131..d8f332c 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -158,13 +158,13 @@ sub get_interface($)
$netbiosname = lc($netbiosname);
my %interfaces = ();
- $interfaces{"locals3dc2"} = 3;
- $interfaces{"localmember3"} = 4;
+ $interfaces{"localnt4dc2"} = 3;
+ $interfaces{"localnt4member3"} = 4;
$interfaces{"localshare4"} = 5;
$interfaces{"localktest6"} = 7;
$interfaces{"maptoguest"} = 8;
- $interfaces{"locals3dc9"} = 9;
+ $interfaces{"localnt4dc9"} = 9;
# 11-16 used by selftest.pl for client interfaces
@@ -177,7 +177,7 @@ sub get_interface($)
$interfaces{"dc7"} = 27;
$interfaces{"rodc"} = 28;
$interfaces{"localadmember"} = 29;
- $interfaces{"plugindc"} = 30;
+ $interfaces{"addc"} = 30;
$interfaces{"localsubdc"} = 31;
$interfaces{"chgdcpass"} = 32;
$interfaces{"promotedvdc"} = 33;
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 934153c..097d90a 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
--
Samba Shared Repository
More information about the samba-cvs
mailing list