summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2021-08-27 11:36:42 +1200
committerJule Anger <janger@samba.org>2021-11-09 19:45:33 +0000
commit72a2c21f3f51d1b56b41c9401419b69b2c916ddf (patch)
treeabe7812d1d9c467b24426be70f072e9f9af4f933 /source4/setup
parent7243bd7d388db2dfaa2072f92162d5cee770c6ea (diff)
downloadsamba-72a2c21f3f51d1b56b41c9401419b69b2c916ddf.tar.gz
CVE-2020-25722 samba-tool spn add: remove --force option
This did not actually *force* the creation of a duplicate SPN, it just ignored the client-side check for the existing copy. Soon we are going to enforce SPN uniqueness on the server side, and this --force will not work. This will make the --force test fail, and if that tests fail, so will others that depend the duplicate values. So we remove those tests. It is wrong-headed to try to make duplicate SPNs in any case, which is probably why there is no sign of anyone ever having used this option. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14564 Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/tests/blackbox_spn.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/source4/setup/tests/blackbox_spn.sh b/source4/setup/tests/blackbox_spn.sh
index 429ace9494f..764ded4c88b 100755
--- a/source4/setup/tests/blackbox_spn.sh
+++ b/source4/setup/tests/blackbox_spn.sh
@@ -22,11 +22,8 @@ testit "addspn" $PYTHON $samba_tool spn add FOO/bar Administrator $CONFIG
testit "delspn" $PYTHON $samba_tool spn delete FOO/bar $CONFIG
testit "readdspn" $PYTHON $samba_tool spn add FOO/bar Administrator $CONFIG
testit_expect_failure "failexistingspn" $PYTHON $samba_tool spn add FOO/bar Guest $CONFIG
-testit "existingspnforce" $PYTHON $samba_tool spn add --force FOO/bar Guest $CONFIG
testit_expect_failure "faildelspnnotgooduser" $PYTHON $samba_tool spn delete FOO/bar krbtgt $CONFIG
-testit_expect_failure "faildelspnmoreoneuser" $PYTHON $samba_tool spn delete FOO/bar $CONFIG
-testit "deluserspn" $PYTHON $samba_tool spn delete FOO/bar Guest $CONFIG
-testit "dellastuserspn" $PYTHON $samba_tool spn delete FOO/bar $CONFIG
+testit "deluserspn" $PYTHON $samba_tool spn delete FOO/bar $CONFIG
testit_expect_failure "faildelspn" $PYTHON $samba_tool spn delete FOO/bar $CONFIG
testit_expect_failure "failaddspn" $PYTHON $samba_tool spn add FOO/bar nonexistinguser $CONFIG