summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2003-07-09 21:12:52 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2003-07-09 21:12:52 (GMT)
commit1d274c11dc49bdebacb5e762bcb106fad8f9537d (patch)
tree62a5705f7df39e2294eeba65e7affc28557521dd
parentf948d9736a903c2647eb18c8b152e962811dd601 (diff)
downloadtk-1d274c11dc49bdebacb5e762bcb106fad8f9537d.zip
tk-1d274c11dc49bdebacb5e762bcb106fad8f9537d.tar.gz
tk-1d274c11dc49bdebacb5e762bcb106fad8f9537d.tar.bz2
Stop xhost smash by the test suite; that can render a machine unusable.
-rw-r--r--ChangeLog6
-rw-r--r--tests/send.test8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bdc4ab8..4377027 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-09 Donal K. Fellows <fellowsd@cs.man.ac.uk>
+
+ * tests/send.test: Strengthened constraints to stop accidental
+ smashing of Xserver access; some systems (*ahem* mine *ahem*)
+ require xhost-style security for all use... :^/
+
2003-07-07 Donal K. Fellows <fellowsd@cs.man.ac.uk>
* generic/tkImage.c (TkDeleteAllImages,etc.): Stopped the deleting
diff --git a/tests/send.test b/tests/send.test
index a40eb98..6a10323 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: send.test,v 1.8 2002/07/14 05:48:46 dgp Exp $
+# RCS: @(#) $Id: send.test,v 1.8.2.1 2003/07/09 21:12:52 dkf Exp $
package require tcltest 2.1
namespace import -force tcltest::configure
@@ -156,7 +156,7 @@ test send-5.4 {ValidateName procedure} {secureserver testsend} {
winfo interps
} {test}
-if {[testConstraint xhost]} {
+if {[testConstraint nonPortable] && [testConstraint xhost]} {
winfo interps
tk appname tktest
update
@@ -171,12 +171,12 @@ test send-6.1 {ServerSecure procedure} {nonPortable secureserver} {
set a 44
list [dobg [list send [tk appname] set a 55]] $a
} {55 55}
-test send-6.2 {ServerSecure procedure} {nonPortable secureserver} {
+test send-6.2 {ServerSecure procedure} {nonPortable secureserver xhost} {
set a 22
exec xhost [exec hostname]
list [catch {dobg [list send [tk appname] set a 33]} msg] $a $msg
} {0 22 {X server insecure (must use xauth-style authorization); command ignored}}
-test send-6.3 {ServerSecure procedure} {nonPortable secureserver} {
+test send-6.3 {ServerSecure procedure} {nonPortable secureserver xhost} {
set a abc
exec xhost - [exec hostname]
list [dobg [list send [tk appname] set a new]] $a