sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

selftest: Add expected-value testing for userParameters

Browse Source 
This does not means that bugs like https://bugzilla.samba.org/show_bug.cgi?id=11881
are fixed, however we do not wish to cause further issues
without noticing it, eg during python3 fixes for dbcheck.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2018-10-23 16:27:29 +13:00
parent fbea9d3699
commit d114ca1e64
2 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source4/selftest/provisions/release-4-1-0rc3/expected-userParameters-after-dbcheck.ldif Normal file
View File

@ -0,0 +1,48 @@
dn: CN=Guest,CN=Users,DC=release-4-1-0rc3,DC=samba,DC=corp
userParameters:: QwB0AHgAQwBmAGcAUAByAGUAcwBlAG4AdAAgACAAIAAgACAAIAAgACAAIAAgA
CAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAUAALABoACA
ABAEMAdAB4AEMAZgBnAFAAcgBlAHMAZQBuAHQANTUxZTBiYjAgAAIAAQBDAHQAeABXAEYAUAByAG8
AZgBpAGwAZQBQAGEAdABoADAwGAACAAEAQwB0AHgAVwBGAEgAbwBtAGUARABpAHIAMDAiAAIAAQBD
AHQAeABXAEYASABvAG0AZQBEAGkAcgBEAHIAaQB2AGUAMDASAAgAAQBDAHQAeABTAGgAYQBkAG8Ad
wAwMTAwMDAwMC4ACAABAEMAdAB4AE0AYQB4AEQAaQBzAGMAbwBuAG4AZQBjAHQAaQBvAG4AVABpAG
0AZQBlMDkzMDQwMCgACAABAEMAdAB4AE0AYQB4AEMAbwBuAG4AZQBjAHQAaQBvAG4AVABpAG0AZQA
0MDc3MWIwMBwACAABAEMAdAB4AE0AYQB4AEkAZABsAGUAVABpAG0AZQBjMDI3MDkwMCAAAgABAEMA
dAB4AFcAbwByAGsARABpAHIAZQBjAHQAbwByAHkAMDAYAAgAAQBDAHQAeABDAGYAZwBGAGwAYQBnA
HMAMQAwMGYwMjY4MCIAAgABAEMAdAB4AEkAbgBpAHQAaQBhAGwAUAByAG8AZwByAGEAbQAwMA==
dn: CN=krbtgt,CN=Users,DC=release-4-1-0rc3,DC=samba,DC=corp
userParameters:: QwB0AHgAQwBmAGcAUAByAGUAcwBlAG4AdAAgACAAIAAgACAAIAAgACAAIAAgA
CAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAUAALABoACA
ABAEMAdAB4AEMAZgBnAFAAcgBlAHMAZQBuAHQANTUxZTBiYjAgAAIAAQBDAHQAeABXAEYAUAByAG8
AZgBpAGwAZQBQAGEAdABoADAwGAACAAEAQwB0AHgAVwBGAEgAbwBtAGUARABpAHIAMDAiAAIAAQBD
AHQAeABXAEYASABvAG0AZQBEAGkAcgBEAHIAaQB2AGUAMDASAAgAAQBDAHQAeABTAGgAYQBkAG8Ad
wAwMTAwMDAwMC4ACAABAEMAdAB4AE0AYQB4AEQAaQBzAGMAbwBuAG4AZQBjAHQAaQBvAG4AVABpAG
0AZQBlMDkzMDQwMCgACAABAEMAdAB4AE0AYQB4AEMAbwBuAG4AZQBjAHQAaQBvAG4AVABpAG0AZQA
0MDc3MWIwMBwACAABAEMAdAB4AE0AYQB4AEkAZABsAGUAVABpAG0AZQBjMDI3MDkwMCAAAgABAEMA
dAB4AFcAbwByAGsARABpAHIAZQBjAHQAbwByAHkAMDAYAAgAAQBDAHQAeABDAGYAZwBGAGwAYQBnA
HMAMQAwMGYwMjY4MCIAAgABAEMAdAB4AEkAbgBpAHQAaQBhAGwAUAByAG8AZwByAGEAbQAwMA==
dn: CN=Administrator,CN=Users,DC=release-4-1-0rc3,DC=samba,DC=corp
userParameters:: IAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgA
CAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAUAAQABoACA
ABAEMAdAB4AEMAZgBnAFAAcgBlAHMAZQBuAHQANTUxZTBiYjAYAAgAAQBDAHQAeABDAGYAZwBGAGw
AYQBnAHMAMQAwMGUwMDAxMBYACAABAEMAdAB4AEMAYQBsAGwAYgBhAGMAawAwMDAwMDAwMBIACAAB
AEMAdAB4AFMAaABhAGQAbwB3ADAxMDAwMDAwKAAIAAEAQwB0AHgATQBhAHgAQwBvAG4AbgBlAGMAd
ABpAG8AbgBUAGkAbQBlADAwMDAwMDAwLgAIAAEAQwB0AHgATQBhAHgARABpAHMAYwBvAG4AbgBlAG
MAdABpAG8AbgBUAGkAbQBlADAwMDAwMDAwHAAIAAEAQwB0AHgATQBhAHgASQBkAGwAZQBUAGkAbQB
lADAwMDAwMDAwIgAIAAEAQwB0AHgASwBlAHkAYgBvAGEAcgBkAEwAYQB5AG8AdQB0ADAwMDAwMDAw
KgACAAEAQwB0AHgATQBpAG4ARQBuAGMAcgB5AHAAdABpAG8AbgBMAGUAdgBlAGwAMDAgAAIAAQBDA
HQAeABXAG8AcgBrAEQAaQByAGUAYwB0AG8AcgB5ADAwIAACAAEAQwB0AHgATgBXAEwAbwBnAG8Abg
BTAGUAcgB2AGUAcgAwMBgAJAABAEMAdAB4AFcARgBIAG8AbQBlAEQAaQByADVjNWM3MzYxNzQ3NTc
yNmU2NTVjNzAyZTYyNjk2NDZmNmUwMCIABgABAEMAdAB4AFcARgBIAG8AbQBlAEQAaQByAEQAcgBp
AHYAZQA1MDNhMDAgADoAAQBDAHQAeABXAEYAUAByAG8AZgBpAGwAZQBQAGEAdABoADVjNWM3MzYxN
zQ3NTcyNmU2NTVjNzA3MjZmNjY2OTZjNjU3NDczNjU1YzcwMmU2MjY5NjQ2ZjZlMDAiAAIAAQBDAH
QAeABJAG4AaQB0AGkAYQBsAFAAcgBvAGcAcgBhAG0AMDAiAAIAAQBDAHQAeABDAGEAbABsAGIAYQB
jAGsATgB1AG0AYgBlAHIAMDA=
ref: ldap:///CN=Configuration,DC=release-4-1-0rc3,DC=samba,DC=corp
ref: ldap:///DC=DomainDnsZones,DC=release-4-1-0rc3,DC=samba,DC=corp
ref: ldap:///DC=ForestDnsZones,DC=release-4-1-0rc3,DC=samba,DC=corp

13
testprogs/blackbox/dbcheck-oldrelease.sh
View File

@ -142,6 +142,18 @@ EOF
fi fi
} }
check_expected_userparameters() {
if [ x$RELEASE = x"release-4-1-0rc3" ]; then
tmpldif=$PREFIX_ABS/$RELEASE/expected-userParameters-after-dbcheck.ldif.tmp
TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb userParameters=* -s sub -b DC=release-4-1-0rc3,DC=samba,DC=corp userParameters --sorted | grep -v \# > $tmpldif
diff $tmpldif $release_dir/expected-userParameters-after-dbcheck.ldif
if [ "$?" != "0" ]; then
return 1
fi
fi
return 0
}
reindex() { reindex() {
$PYTHON $BINDIR/samba-tool dbcheck --reindex -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ $PYTHON $BINDIR/samba-tool dbcheck --reindex -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@
} }
@ -406,6 +418,7 @@ if [ -d $release_dir ]; then
testit "add_userparameters3" add_userparameters3 testit "add_userparameters3" add_userparameters3
testit_expect_failure "dbcheck2" dbcheck2 testit_expect_failure "dbcheck2" dbcheck2
testit "dbcheck_clean2" dbcheck_clean2 testit "dbcheck_clean2" dbcheck_clean2
testit "check_expected_userparameters" check_expected_userparameters
testit "rm_deleted_objects" rm_deleted_objects testit "rm_deleted_objects" rm_deleted_objects
# We must re-index again because rm_deleted_objects went behind # We must re-index again because rm_deleted_objects went behind
# the back of the main sam.ldb. # the back of the main sam.ldb.