From 5f3f1dbfaaf884a7c8fc5934f914f31711d84707 Mon Sep 17 00:00:00 2001 From: William Joye Date: Mon, 25 Sep 2017 16:19:22 -0400 Subject: XPA: rm checkdns from init sequence --- ds9/library/ds9.tcl | 4 ---- ds9/library/xpa.tcl | 17 ----------------- 2 files changed, 21 deletions(-) diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl index 8705d27..f4f0bcf 100644 --- a/ds9/library/ds9.tcl +++ b/ds9/library/ds9.tcl @@ -317,10 +317,6 @@ switch $ds9(wm) { package require xmlrpc package require DS9 - - proc checkdns {a b {c {}}} { - return 0 - } } } diff --git a/ds9/library/xpa.tcl b/ds9/library/xpa.tcl index 32cf316..28c4de8 100644 --- a/ds9/library/xpa.tcl +++ b/ds9/library/xpa.tcl @@ -9,23 +9,6 @@ proc InitXPA {} { global pds9 global env - # this is needed - # if there is a problem (usually with VPN), XPA will hang - # so preempt and set to local before XPAINIT - if {[info exists env(XPA_METHOD)]} { - if {$env(XPA_METHOD) != {local}} { - if {[checkdns {} 5]} { - set env(XPA_METHOD) local - Error [msgcat::mc {XPA unable to verify hostname, setting XPA_METHOD to LOCAL}] - } - } - } else { - if {[checkdns {} 5]} { - set env(XPA_METHOD) local - Error [msgcat::mc {XPA unable to verify hostname, setting XPA_METHOD to LOCAL}] - } - } - switch -- $ds9(wm) { x11 - win32 {} -- cgit v0.12