selftest: Add tests for dbcheck detection and removal of partial objects

To avoid listing all the provision snapshots, we use a broader blacklist for waf dist
and a whitelist for dbcheck-oldrelease.sh

Andrew Bartlett

Change-Id: Iab0ff4be0b4287dc128a49302836a6f0f7b39678
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/tests.py b/selftest/tests.py
index 7b371112edb177ca9cfbf2fa1c23086fb5b574a1..88a08c9724da91fd2366fb7c2fe934b727439ad4 100644 (file)
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -62,6 +62,7 @@ planpythontestsuite("none", "wafsamba.tests.test_suite", extra_path=[os.path.joi
 plantestsuite("samba4.blackbox.dbcheck.alpha13", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), '$PREFIX_ABS/provision', 'alpha13', configuration])
 plantestsuite("samba4.blackbox.dbcheck.release-4-0-0", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), '$PREFIX_ABS/provision', 'release-4-0-0', configuration])
 plantestsuite("samba4.blackbox.dbcheck.release-4-1-0rc3", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), '$PREFIX_ABS/provision', 'release-4-1-0rc3', configuration])
+plantestsuite("samba4.blackbox.dbcheck.release-4-1-6-partial-object", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), '$PREFIX_ABS/provision', 'release-4-1-6-partial-object', configuration])
 plantestsuite("samba4.blackbox.upgradeprovision.alpha13", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "upgradeprovision-oldrelease.sh"), '$PREFIX_ABS/provision', 'alpha13', configuration])
 plantestsuite("samba4.blackbox.upgradeprovision.release-4-0-0", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "upgradeprovision-oldrelease.sh"), '$PREFIX_ABS/provision', 'release-4-0-0', configuration])
 planpythontestsuite("none", "samba.tests.upgradeprovision")

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/etc/smb.conf.template b/source4/selftest/provisions/release-4-1-6-partial-object/etc/smb.conf.template
new file mode 100644 (file)
index 0000000..17b81fd
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/etc/smb.conf.template
@@ -0,0 +1,16 @@
+
+[global]
+       netbios name = LOCALDC
+       workgroup = SAMBADOMAIN
+       realm = SAMBA.EXAMPLE.COM
+       private dir = @@PREFIX@@/private
+       lock dir = @@PREFIX@@/
+       posix:eadb = @@PREFIX@@/private/eadb.tdb
+
+[sysvol]
+       path = @@PREFIX@@/sysvol
+       read only = no
+
+[netlogon]
+       path = @@PREFIX@@/sysvol/samba.example.com/scripts
+       read only = no

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/dns_update_list b/source4/selftest/provisions/release-4-1-6-partial-object/private/dns_update_list
new file mode 100644 (file)
index 0000000..4da0398
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/dns_update_list
@@ -0,0 +1,39 @@
+# this is a list of DNS entries which will be put into DNS using
+# dynamic DNS update. It is processed by the samba_dnsupdate script
+A                                                        ${DNSDOMAIN} $IP
+A                                                        ${HOSTNAME} $IP
+AAAA                                                     ${DNSDOMAIN} $IP
+AAAA                                                     ${HOSTNAME} $IP
+
+A                                                        gc._msdcs.${DNSFOREST} $IP
+AAAA                                                     gc._msdcs.${DNSFOREST} $IP
+
+CNAME ${NTDSGUID}._msdcs.${DNSFOREST}                    ${HOSTNAME}
+
+SRV _kpasswd._tcp.${DNSDOMAIN}                           ${HOSTNAME} 464
+SRV _kpasswd._udp.${DNSDOMAIN}                           ${HOSTNAME} 464
+
+SRV _kerberos._tcp.${DNSDOMAIN}                          ${HOSTNAME} 88
+SRV _kerberos._tcp.dc._msdcs.${DNSDOMAIN}                ${HOSTNAME} 88
+SRV _kerberos._tcp.dc._msdcs.${DNSFOREST}                ${HOSTNAME} 88
+SRV _kerberos._tcp.${SITE}._sites.${DNSDOMAIN}           ${HOSTNAME} 88
+SRV _kerberos._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN} ${HOSTNAME} 88
+SRV _kerberos._tcp.${SITE}._sites.dc._msdcs.${DNSFOREST} ${HOSTNAME} 88
+
+SRV _kerberos._udp.${DNSDOMAIN}                          ${HOSTNAME} 88
+
+SRV _ldap._tcp.${DNSDOMAIN}                              ${HOSTNAME} 389
+SRV _ldap._tcp.dc._msdcs.${DNSDOMAIN}                    ${HOSTNAME} 389
+SRV _ldap._tcp.dc._msdcs.${DNSFOREST}                    ${HOSTNAME} 389
+SRV _ldap._tcp.gc._msdcs.${DNSFOREST}                    ${HOSTNAME} 3268
+SRV _ldap._tcp.pdc._msdcs.${DNSDOMAIN}                   ${HOSTNAME} 389
+SRV _ldap._tcp.pdc._msdcs.${DNSFOREST}                   ${HOSTNAME} 389
+SRV _ldap._tcp.${SITE}._sites.${DNSDOMAIN}              ${HOSTNAME} 389
+SRV _ldap._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN}     ${HOSTNAME} 389
+SRV _ldap._tcp.${SITE}._sites.dc._msdcs.${DNSFOREST}     ${HOSTNAME} 389
+SRV _ldap._tcp.${SITE}._sites.gc._msdcs.${DNSFOREST}     ${HOSTNAME} 3268
+SRV _ldap._tcp.${DOMAINGUID}.domains._msdcs.${DNSFOREST} ${HOSTNAME} 389
+
+
+SRV _gc._tcp.${DNSFOREST}                                ${HOSTNAME} 3268
+SRV _gc._tcp.${SITE}._sites.${DNSFOREST}                 ${HOSTNAME} 3268

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/hklm.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/hklm.ldb.dump
new file mode 100644 (file)
index 0000000..3d54547
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/hklm.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/idmap.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/idmap.ldb.dump
new file mode 100644 (file)
index 0000000..71e714c
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/idmap.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/krb5.conf b/source4/selftest/provisions/release-4-1-6-partial-object/private/krb5.conf
new file mode 100644 (file)
index 0000000..8c1ad96
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/krb5.conf
@@ -0,0 +1,4 @@
+[libdefaults]
+       default_realm = SAMBA.EXAMPLE.COM
+       dns_lookup_realm = false
+       dns_lookup_kdc = true

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/named.conf.update b/source4/selftest/provisions/release-4-1-6-partial-object/private/named.conf.update
new file mode 100644 (file)
index 0000000..1f3ca4a
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/named.conf.update
@@ -0,0 +1,7 @@
+/* this file is auto-generated - do not edit */
+update-policy {
+       grant SAMBA.EXAMPLE.COM ms-self * A AAAA;
+       grant Administrator@SAMBA.EXAMPLE.COM wildcard * A AAAA SRV CNAME;
+       grant PROMOTEDVDC$@samba.example.com wildcard * A AAAA SRV CNAME;
+       grant LOCALDC$@samba.example.com wildcard * A AAAA SRV CNAME;
+};

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/privilege.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/privilege.ldb.dump
new file mode 100644 (file)
index 0000000..b3efd0f
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/privilege.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/randseed.tdb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/randseed.tdb.dump
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/CN=CONFIGURATION,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/CN=CONFIGURATION,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump
new file mode 100644 (file)
index 0000000..56511f3
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/CN=CONFIGURATION,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/CN=SCHEMA,CN=CONFIGURATION,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/CN=SCHEMA,CN=CONFIGURATION,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump
new file mode 100644 (file)
index 0000000..fb8b25c
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/CN=SCHEMA,CN=CONFIGURATION,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/DC=DOMAINDNSZONES,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/DC=DOMAINDNSZONES,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump
new file mode 100644 (file)
index 0000000..b04812e
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/DC=DOMAINDNSZONES,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/DC=FORESTDNSZONES,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/DC=FORESTDNSZONES,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump
new file mode 100644 (file)
index 0000000..606b2ad
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/DC=FORESTDNSZONES,DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump
new file mode 100644 (file)
index 0000000..6f95f84
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/DC=SAMBA,DC=EXAMPLE,DC=COM.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/metadata.tdb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/metadata.tdb.dump
new file mode 100644 (file)
index 0000000..d7d83a5
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.d/metadata.tdb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.dump
new file mode 100644 (file)
index 0000000..8d81b32
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/sam.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/schannel_store.tdb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/schannel_store.tdb.dump
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/secrets.keytab b/source4/selftest/provisions/release-4-1-6-partial-object/private/secrets.keytab
new file mode 100644 (file)
index 0000000..40fb1b8
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/secrets.keytab differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/secrets.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/secrets.ldb.dump
new file mode 100644 (file)
index 0000000..e61b3e4
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/secrets.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/secrets.tdb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/secrets.tdb.dump
new file mode 100644 (file)
index 0000000..e7110c2
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/secrets.tdb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/share.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/share.ldb.dump
new file mode 100644 (file)
index 0000000..ca68e4d
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/share.ldb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/smbd.tmp/msg/names.tdb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/smbd.tmp/msg/names.tdb.dump
new file mode 100644 (file)
index 0000000..57b49fc
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/smbd.tmp/msg/names.tdb.dump differ

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/spn_update_list b/source4/selftest/provisions/release-4-1-6-partial-object/private/spn_update_list
new file mode 100644 (file)
index 0000000..ceefd23
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/spn_update_list
@@ -0,0 +1,30 @@
+# this is a list of servicePrincipalName entries
+# that we need to add on our account. It is processed by
+# the samba_spnupdate script
+
+HOST/${HOSTNAME}
+HOST/${HOSTNAME}/${WORKGROUP}
+ldap/${HOSTNAME}/${WORKGROUP}
+GC/${HOSTNAME}/${DNSFOREST}
+ldap/${HOSTNAME}
+HOST/${HOSTNAME}/${DNSDOMAIN}
+ldap/${HOSTNAME}/${DNSDOMAIN}
+HOST/${NETBIOSNAME}
+E3514235-4B06-11D1-AB04-00C04FC2DCD2/${NTDSGUID}/${DNSDOMAIN}
+ldap/${NTDSGUID}._msdcs.${DNSFOREST}
+ldap/${NETBIOSNAME}
+RestrictedKrbHost/${NETBIOSNAME}
+RestrictedKrbHost/${HOSTNAME}
+ldap/${HOSTNAME}/DomainDnsZones.${DNSDOMAIN}
+ldap/${HOSTNAME}/ForestDnsZones.${DNSDOMAIN}
+
+# These are not supported yet:
+# NtFrs-88f5d2bd-b646-11d2-a6d3-00c04fc9b232/${HOSTNAME}
+# Dfsr-12F9A27C-BF97-4787-9364-D31B6C55EB04/${HOSTNAME}
+#
+# Only used in DNS mode: (This is added on dns-${HOSTNAME} account, should not be added here)
+# DNS/${HOSTNAME}
+#
+# Only used on Terminal Server mode:
+# TERMSRV/${HOSTNAME}
+# TERMSRV/${NETBIOSNAME}

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/admincert.pem b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/admincert.pem
new file mode 100644 (file)
index 0000000..c464fba
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/admincert.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIIDHTCCAoagAwIBAgIUUggzW4lLRkMKe1DAR2NKatkMDYwwCwYJKoZIhvcNAQELMFIxEzAR
+BgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxlMRUwEwYKCZImiZPy
+LGQBGQwFc2FtYmExCzAJBgNVBAMMAkNBMCIYDzIwMDkwNzI3MDMzMjE1WhgPMjAzNDA3MjIw
+MzMyMTVaMG0xEzARBgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxl
+MRUwEwYKCZImiZPyLGQBGQwFc2FtYmExDjAMBgNVBAMMBXVzZXJzMRYwFAYDVQQDDA1BZG1p
+bmlzdHJhdG9yMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD0+OL7TQBj0RejbIH1+g5G
+eRaWaM9xF43uE5y7jUHEsi5owhZF5iIoHZeeL6cpDF5y1BZRs0JlA1VqMry1jjKlzFYVEMMF
+xB6esnXhl0Jpip1JkUMMXLOP1m/0dqayuHBWozj9f/cdyCJr0wJIX1Z8Pr+EjYRGPn/MF0xd
+l3JRlwIDAQABo4HSMIHPMA4GA1UdDwEB/wQEAwIFoDAoBgNVHSUEITAfBgcrBgEFAgMEBggr
+BgEFBQcDAgYKKwYBBAGCNxQCAjBIBgNVHREEQTA/oD0GBisGAQUCAqAzMDGgExsRU0FNQkEu
+RVhBTVBMRS5DT02hGjAYoAMCAQGhETAPGw1BZG1pbmlzdHJhdG9yMB8GA1UdIwQYMBaAFMLZ
+ufegDKLZs0VOyFXYK1L6M8oyMB0GA1UdDgQWBBQg81bLyfCA88C2B/BDjXlGuaFaxjAJBgNV
+HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4GBAEf/OSHUDJaGdtWGNuJeqcVYVMwrfBAc0OSwVhz1
+7/xqKHWo8wIMPkYRtaRHKLNDsF8GkhQPCpVsa6mX/Nt7YQnNvwd+1SBP5E8GvwWw9ZzLJvma
+nk2n89emuayLpVtp00PymrDLRBcNaRjFReQU8f0o509kiVPHduAp3jOiy13l
+-----END CERTIFICATE-----

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/admincertupn.pem b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/admincertupn.pem
new file mode 100644 (file)
index 0000000..234173b
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/admincertupn.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIIDDzCCAnigAwIBAgIUUp3CJMuNaEaAdPKp3QdNIwG7a4wwCwYJKoZIhvcNAQELMFIxEzAR
+BgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxlMRUwEwYKCZImiZPy
+LGQBGQwFc2FtYmExCzAJBgNVBAMMAkNBMCIYDzIwMDkwNzI3MDMzMzA1WhgPMjAzNDA3MjIw
+MzMzMDVaMG0xEzARBgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxl
+MRUwEwYKCZImiZPyLGQBGQwFc2FtYmExDjAMBgNVBAMMBXVzZXJzMRYwFAYDVQQDDA1BZG1p
+bmlzdHJhdG9yMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD0+OL7TQBj0RejbIH1+g5G
+eRaWaM9xF43uE5y7jUHEsi5owhZF5iIoHZeeL6cpDF5y1BZRs0JlA1VqMry1jjKlzFYVEMMF
+xB6esnXhl0Jpip1JkUMMXLOP1m/0dqayuHBWozj9f/cdyCJr0wJIX1Z8Pr+EjYRGPn/MF0xd
+l3JRlwIDAQABo4HEMIHBMA4GA1UdDwEB/wQEAwIFoDAoBgNVHSUEITAfBgcrBgEFAgMEBggr
+BgEFBQcDAgYKKwYBBAGCNxQCAjA6BgNVHREEMzAxoC8GCisGAQQBgjcUAgOgIQwfYWRtaW5p
+c3RyYXRvckBzYW1iYS5leGFtcGxlLmNvbTAfBgNVHSMEGDAWgBTC2bn3oAyi2bNFTshV2CtS
++jPKMjAdBgNVHQ4EFgQUIPNWy8nwgPPAtgfwQ415RrmhWsYwCQYDVR0TBAIwADANBgkqhkiG
+9w0BAQsFAAOBgQBk42+egeUB3Ji2PC55fbt3FNKxvmm2xUUFkV9POK/YR9rajKOwk5jtYSeS
+Zd7J9s//rNFNa7waklFkDaY56+QWTFtdvxfE+KoHaqt6X8u6pqi7p3M4wDKQox+9Dx8yWFyq
+Wfz/8alZ5aMezCQzXJyIaJsCLeKABosSwHcpAFmxlQ==
+-----END CERTIFICATE-----

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/adminkey.pem b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/adminkey.pem
new file mode 100644 (file)
index 0000000..651839b
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/adminkey.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQD0+OL7TQBj0RejbIH1+g5GeRaWaM9xF43uE5y7jUHEsi5owhZF
+5iIoHZeeL6cpDF5y1BZRs0JlA1VqMry1jjKlzFYVEMMFxB6esnXhl0Jpip1JkUMM
+XLOP1m/0dqayuHBWozj9f/cdyCJr0wJIX1Z8Pr+EjYRGPn/MF0xdl3JRlwIDAQAB
+AoGAP8mjCP628Ebc2eACQzOWjgEvwYCPK4qPmYOf1zJkArzG2t5XAGJ5WGrENRuB
+cm3XFh1lpmaADl982UdW3gul4gXUy6w4XjKK4vVfhyHj0kZ/LgaXUK9BAGhroJ2L
+osIOUsaC6jdx9EwSRctwdlF3wWJ8NK0g28AkvIk+FlolW4ECQQD7w5ouCDnf58CN
+u4nARx4xv5XJXekBvOomkCQAmuOsdOb6b9wn3mm2E3au9fueITjb3soMR31AF6O4
+eAY126rXAkEA+RgHzybzZEP8jCuznMqoN2fq/Vrs6+W3M8/G9mzGEMgLLpaf2Jiz
+I9tLZ0+OFk9tkRaoCHPfUOCrVWJZ7Y53QQJBAMhoA6rw0WDyUcyApD5yXg6rusf4
+ASpo/tqDkqUIpoL464Qe1tjFqtBM3gSXuhs9xsz+o0bzATirmJ+WqxrkKTECQHt2
+OLCpKqwAspU7N+w32kaUADoRLisCEdrhWklbwpQgwsIVsCaoEOpt0CLloJRYTANE
+yoZeAErTALjyZYZEPcECQQDlUi0N8DFxQ/lOwWyR3Hailft+mPqoPCa8QHlQZnlG
++cfgNl57YHMTZFwgUVFRdJNpjH/WdZ5QxDcIVli0q+Ko
+-----END RSA PRIVATE KEY-----

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/ca.pem b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/ca.pem
new file mode 100644 (file)
index 0000000..58eea7f
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/ca.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICcTCCAdqgAwIBAgIUaBPmjnPVqyFqR5foICmLmikJTzgwCwYJKoZIhvcNAQEFMFIxEzAR
+BgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxlMRUwEwYKCZImiZPy
+LGQBGQwFc2FtYmExCzAJBgNVBAMMAkNBMCIYDzIwMDgwMzAxMTIyMzEyWhgPMjAzMzAyMjQx
+MjIzMTJaMFIxEzARBgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxl
+MRUwEwYKCZImiZPyLGQBGQwFc2FtYmExCzAJBgNVBAMMAkNBMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDKg6pAwCHUMA1DfHDmWhZfd+F0C+9Jxcqvpw9ii9En3E1uflpcol3+S9/6
+I/uaTmJHZre+DF3dTzb/UOZo0Zem8N+IzzkgoGkFafjXuT3BL5UPY2/H6H+pPqVIRLOmrWIm
+ai359YyoKhFyo37Y6HPeU8QcZ+u2rS9geapIWfeuowIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AaYwHQYDVR0OBBYEFMLZufegDKLZs0VOyFXYK1L6M8oyMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEFBQADgYEAAZJbCAAkaqgFJ0xgNovn8Ydd0KswQPjicwiODPgw9ZPoD2HiOUVO
+yYDRg/dhFF9y656OpcHk4N7qZ2sl3RlHkzDu+dseETW+CnKvQIoXNyeARRJSsSlwrwcoD4JR
+HTLk2sGigsWwrJ2N99sG/cqSJLJ1MFwLrs6koweBnYU0f/g=
+-----END CERTIFICATE-----

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/cert.pem b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/cert.pem
new file mode 100644 (file)
index 0000000..8e04f0f
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/cert.pem
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICYTCCAcygAwIBAgIE5M7SRDALBgkqhkiG9w0BAQUwZTEdMBsGA1UEChMUU2Ft
+YmEgQWRtaW5pc3RyYXRpb24xNDAyBgNVBAsTK1NhbWJhIC0gdGVtcG9yYXJ5IGF1
+dG9nZW5lcmF0ZWQgY2VydGlmaWNhdGUxDjAMBgNVBAMTBVNhbWJhMB4XDTA2MDgw
+NDA0MzY1MloXDTA4MDcwNDA0MzY1MlowZTEdMBsGA1UEChMUU2FtYmEgQWRtaW5p
+c3RyYXRpb24xNDAyBgNVBAsTK1NhbWJhIC0gdGVtcG9yYXJ5IGF1dG9nZW5lcmF0
+ZWQgY2VydGlmaWNhdGUxDjAMBgNVBAMTBVNhbWJhMIGcMAsGCSqGSIb3DQEBAQOB
+jAAwgYgCgYDKg6pAwCHUMA1DfHDmWhZfd+F0C+9Jxcqvpw9ii9En3E1uflpcol3+
+S9/6I/uaTmJHZre+DF3dTzb/UOZo0Zem8N+IzzkgoGkFafjXuT3BL5UPY2/H6H+p
+PqVIRLOmrWImai359YyoKhFyo37Y6HPeU8QcZ+u2rS9geapIWfeuowIDAQABoyUw
+IzAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAsGCSqGSIb3DQEB
+BQOBgQAmkN6XxvDnoMkGcWLCTwzxGfNNSVcYr7TtL2aJh285Xw9zaxcm/SAZBFyG
+LYOChvh6hPU7joMdDwGfbiLrBnMag+BtGlmPLWwp/Kt1wNmrRhduyTQFhN3PP6fz
+nBr9vVny2FewB2gHmelaPS//tXdxivSXKz3NFqqXLDJjq7P8wA==
+-----END CERTIFICATE-----

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/dhparms.pem b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/dhparms.pem
new file mode 100644 (file)
index 0000000..e43f14c
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/dhparms.pem
@@ -0,0 +1,5 @@
+-----BEGIN DH PARAMETERS-----
+MGYCYQC/eWD2xkb7uELmqLi+ygPMKyVcpHUo2yCluwnbPutEueuxrG/Cys8j8wLO
+svCN/jYNyR2NszOmg7ZWcOC/4z/4pWDVPUZr8qrkhj5MRKJc52MncfaDglvEdJrv
+YX70obsCAQI=
+-----END DH PARAMETERS-----

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/kdc.pem b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/kdc.pem
new file mode 100644 (file)
index 0000000..d2fdbb5
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/kdc.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAnWgAwIBAgIUI2Tzj+JnMzMcdeabcNo30rovzFAwCwYJKoZIhvcNAQEFMFIxEzAR
+BgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxlMRUwEwYKCZImiZPy
+LGQBGQwFc2FtYmExCzAJBgNVBAMMAkNBMCIYDzIwMDgwMzAxMTMxOTIzWhgPMjAzMzAyMjQx
+MzE5MjNaMGYxEzARBgoJkiaJk/IsZAEZDANjb20xFzAVBgoJkiaJk/IsZAEZDAdleGFtcGxl
+MRUwEwYKCZImiZPyLGQBGQwFc2FtYmExDjAMBgNVBAMMBXVzZXJzMQ8wDQYDVQQDDAZrcmJ0
+Z3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMqDqkDAIdQwDUN8cOZaFl934XQL70nF
+yq+nD2KL0SfcTW5+WlyiXf5L3/oj+5pOYkdmt74MXd1PNv9Q5mjRl6bw34jPOSCgaQVp+Ne5
+PcEvlQ9jb8fof6k+pUhEs6atYiZqLfn1jKgqEXKjftjoc95TxBxn67atL2B5qkhZ966jAgMB
+AAGjgcgwgcUwDgYDVR0PAQH/BAQDAgWgMBIGA1UdJQQLMAkGBysGAQUCAwUwVAYDVR0RBE0w
+S6BJBgYrBgEFAgKgPzA9oBMbEVNBTUJBLkVYQU1QTEUuQ09NoSYwJKADAgEBoR0wGxsGa3Ji
+dGd0GxFTQU1CQS5FWEFNUExFLkNPTTAfBgNVHSMEGDAWgBTC2bn3oAyi2bNFTshV2CtS+jPK
+MjAdBgNVHQ4EFgQUwtm596AMotmzRU7IVdgrUvozyjIwCQYDVR0TBAIwADANBgkqhkiG9w0B
+AQUFAAOBgQBmrVD5MCmZjfHp1nEnHqTIh8r7lSmVtDx4s9MMjxm9oNrzbKXynvdhwQYFVarc
+ge4yRRDXtSebErOl71zVJI9CVeQQpwcH+tA85oGA7oeFtO/S7ls581RUU6tGgyxV4veD+lJv
+KPH5LevUtgD+q9H4LU4Sq5N3iFwBaeryB0g2wg==
+-----END CERTIFICATE-----

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/key.pem b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/key.pem
new file mode 100644 (file)
index 0000000..e191a73
--- /dev/null
+++ b/source4/selftest/provisions/release-4-1-6-partial-object/private/tls/key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDKg6pAwCHUMA1DfHDmWhZfd+F0C+9Jxcqvpw9ii9En3E1uflpc
+ol3+S9/6I/uaTmJHZre+DF3dTzb/UOZo0Zem8N+IzzkgoGkFafjXuT3BL5UPY2/H
+6H+pPqVIRLOmrWImai359YyoKhFyo37Y6HPeU8QcZ+u2rS9geapIWfeuowIDAQAB
+AoGAAqDLzFRR/BF1kpsiUfL4WFvTarCe9duhwj7ORc6fs785qAXuwUYAJ0Uvzmy6
+HqoGv3t3RfmeHDmjcpPHsbOKnsOQn2MgmthidQlPBMWtQMff5zdoYNUFiPS0XQBq
+szNW4PRjaA9KkLQVTwnzdXGkBSkn/nGxkaVu7OR3vJOBoo0CQQDO4upypesnbe6p
+9/xqfZ2uim8IwV1fLlFClV7WlCaER8tsQF4lEi0XSzRdXGUD/dilpY88Nb+xok/X
+8Z8OvgAXAkEA+pcLsx1gN7kxnARxv54jdzQjC31uesJgMKQXjJ0h75aUZwTNHmZQ
+vPxi6u62YiObrN5oivkixwFNncT9MxTxVQJBAMaWUm2SjlLe10UX4Zdm1MEB6OsC
+kVoX37CGKO7YbtBzCfTzJGt5Mwc1DSLA2cYnGJqIfSFShptALlwedot0HikCQAJu
+jNKEKnbf+TdGY8Q0SKvTebOW2Aeg80YFkaTvsXCdyXrmdQcifw4WdO9KucJiDhSz
+Y9hVapz7ykEJtFtWjLECQQDIlfc63I5ZpXfg4/nN4IJXUW6AmPVOYIA5215itgki
+cSlMYli1H9MEXH0pQMGv5Qyd0OYIx2DDg96mZ+aFvqSG
+-----END RSA PRIVATE KEY-----

diff --git a/source4/selftest/provisions/release-4-1-6-partial-object/private/wins_config.ldb.dump b/source4/selftest/provisions/release-4-1-6-partial-object/private/wins_config.ldb.dump
new file mode 100644 (file)
index 0000000..100d379
Binary files /dev/null and b/source4/selftest/provisions/release-4-1-6-partial-object/private/wins_config.ldb.dump differ

diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh
index e536e84230cd6a15a64e89b450304a26ea932861..fbc9e9b22d408881acff9452cc78a7a71a715a4f 100755 (executable)
--- a/testprogs/blackbox/dbcheck-oldrelease.sh
+++ b/testprogs/blackbox/dbcheck-oldrelease.sh
@@ -38,9 +38,9 @@ dbcheck_clean() {
 }
 
 # This should 'fail', because it returns the number of modified records.  
-# We don't need to run this against 4.1.0rc3
+# We don't need to run this against 4.1 releases
 dbcheck_acl_reset() {
-    if [ x$RELEASE != x"release-4-1-0rc3" ]; then
+    if [ x$RELEASE = x"release-4-0-0" -o x$RELEASE = x"alpha13" ]; then
        $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@
     else 
        return 1

diff --git a/wscript b/wscript
index 5114e267c2935b207cc9d406750a14be9448efab..80587ef349f17d5bfbcde078cf9112c33b3ba8cd 100644 (file)
--- a/wscript
+++ b/wscript
@@ -12,7 +12,7 @@ import wafsamba, Options, samba_dist, Scripting, Utils, samba_version
 
 
 samba_dist.DIST_DIRS('.')
-samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions/alpha13 source4/selftest/provisions/release-4-0-0/ source4/selftest/provisions/release-4-1-0rc3/')
+samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions')
 
 # install in /usr/local/samba by default
 Options.default_prefix = '/usr/local/samba'