From 0c447e637393c310e6a8eface38e4260a2b9e57b Mon Sep 17 00:00:00 2001
From: ian <ian>
Date: Thu, 6 Sep 2001 15:41:56 +0000
Subject: [PATCH] Add domains to vtwmrc ncipher hosts.

---
 config         |  6 ++++--
 files/_.vtwmrc | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/config b/config
index a3bc0b0..c1e0362 100644
--- a/config
+++ b/config
@@ -22,7 +22,9 @@ if ($s =~ m/^Linux$/) {
     die "$s ?";
 }
 
-$ncipher= $hostname =~ m/\.ncipher\.com$/ ? 'cam' :
-          $hostname =~ m/\.ncipherusa\.com$/ ? 'bos' :
+$ncipher= $hostname =~ m/\.(ncipher\.com$)/    ? 'cam' :
+          $hostname =~ m/\.(ncipherusa\.com$)/ ? 'bos' :
           0;
 
+%ncipherdom= ('cam' => 'ncipher.com',
+	      'bos' => 'ncipherusa.com');
diff --git a/files/_.vtwmrc b/files/_.vtwmrc
index 39429a8..3eb1ad0 100644
--- a/files/_.vtwmrc
+++ b/files/_.vtwmrc
@@ -284,13 +284,13 @@ Menu "hosts"
         "Hosts"		f.title
 @@-
 	sub host {
-		my ($x,$usex,$rsh) = @_;
+		my ($x,$xfqdn,$usex,$rsh) = @_;
 		$x =~ m/^(.)(.*)$/;
 		my ($y) = (uc $1).$2;
 		my ($rlss) = $rsh ? 'rlogin' : 'ssh';
 		return " \"$y\"\t\t!\"".
  ($usex ? "remoteshell ".($rsh?'-rrsh ':'')."$x" :
-	"xterm-CT '$x $rlss' -e $rlss $x"). "\t&\"";
+	"xterm-CT '$x $rlss' -e $rlss $xfqdn"). "\t&\"";
 	}
 @@
 
@@ -298,14 +298,14 @@ Menu "hosts"
 @@-
 	sub host_nc {
 		my ($x,$h,$rsh) = @_;
-		&host($x, $ncipher eq $h, $rsh);
+		&host($x,"$x.$ncipherdom{$h}", $ncipher eq $h, $rsh);
 	}
 @@
 @@ &host_nc(	'dover',	'cam',	1)	@@
  ""		f.nop
 @@ &host_nc(	'dounreay',	'cam',	0)	@@
-@@ &host(	'titanic',	0,	1)	@@
-@@ &host(	'belgrano',	0,	0)	@@
+@@ &host(	'titanic','titanic.ncipher.com',	0,	1)	@@
+@@ &host(	'belgrano','belgrano.ncipher.com',	0,	0)	@@
  ""		f.nop
 @@ &host_nc(	'pell',		'bos',	0)	@@
  ""		f.nop
-- 
2.30.2