From 6f215e4f1bd7e94b409dcd44d59b7ff32ad28adc Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Wed, 9 Jul 2003 21:18:35 +0000
Subject: Stop xhost smash by the test suite; that can render a machine
 unusable.

---
 ChangeLog       | 6 ++++++
 tests/send.test | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 826a7bb..75ec93a 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  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* generic/tkTextDisp.c (DisplayText): correct use of textPtr data
diff --git a/tests/send.test b/tests/send.test
index 9eab6c5..83677d9 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.9 2003/04/01 21:06:51 dgp Exp $
+# RCS: @(#) $Id: send.test,v 1.10 2003/07/09 21:18:36 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -153,7 +153,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
@@ -168,12 +168,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
-- 
cgit v0.12