Add domains to vtwmrc ncipher hosts.

diff --git a/config b/config
index a3bc0b0074af37194c7775b36755b5bf85a22b3f..c1e03623408ad0d451aa72981b98c8b46413165f 100644 (file)
--- 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 39429a878f5301e9702242ab3206c15c3739ca3c..3eb1ad0800ecb8e89646998e68d9da59ac877191 100644 (file)
--- 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