disable X11 forwarding by default

diff --git a/.ssh/config.in b/.ssh/config.in
index c7af6e0ad24bb0ec07e4edabeb11ffb07685ba83..537b3bfe9938616ed16b210f333e4afdf3d132b9 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -111,7 +111,6 @@ Host clegg.lehel.madduck.net | clegg.lehel | clegg
 
 Host albatross.lehel.madduck.net | albatross.lehel | albatross
   Hostname albatross.lehel.madduck.net
 
 Host albatross.lehel.madduck.net | albatross.lehel | albatross
   Hostname albatross.lehel.madduck.net

-  ForwardX11 yes

   HostKeyAlias albatross.lehel
 Host albatross-luks
   Hostname albatross.lehel.madduck.net
   HostKeyAlias albatross.lehel
 Host albatross-luks
   Hostname albatross.lehel.madduck.net


@@ -140,12 +139,10 @@ Host embryo.gauting.madduck.net | embryo
 
 Host mother.gauting | mother | mother.gauting.madduck.net
   Hostname mother.gauting
 
 Host mother.gauting | mother | mother.gauting.madduck.net
   Hostname mother.gauting

-  ForwardX11 yes

 Host mothere
   Hostname embryo.gauting.madduck.net
   Port 22021
   CheckHostIP no
 Host mothere
   Hostname embryo.gauting.madduck.net
   Port 22021
   CheckHostIP no

-  ForwardX11 yes

   HostKeyAlias mother.gauting.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   HostKeyAlias mother.gauting.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel


@@ -173,19 +170,14 @@ Host julia-via-wall | rjulia
 Host jugband.mtvic.madduck.net | jugband.mtvic | jugband
   Hostname jugband.mtvic.madduck.net
 
 Host jugband.mtvic.madduck.net | jugband.mtvic | jugband
   Hostname jugband.mtvic.madduck.net
 

-Host lelina.mtvic.madduck.net | lelina.mtvic | lelina
-  ForwardX11 yes
-

 ### ROAD WARRIORS
 
 Host fishbowl.*
   CheckHostIP no
 ### ROAD WARRIORS
 
 Host fishbowl.*
   CheckHostIP no

-  ForwardX11 yes

   HostKeyAlias fishbowl
 
 Host fishbowl | fishbowl.rw.madduck.net
   CheckHostIP no
   HostKeyAlias fishbowl
 
 Host fishbowl | fishbowl.rw.madduck.net
   CheckHostIP no

-  ForwardX11 yes

   HostKeyAlias fishbowl
   ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,lehel,gauting,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -vq0 \${TARGETS%%%%,*} %p"
 
   HostKeyAlias fishbowl
   ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,lehel,gauting,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -vq0 \${TARGETS%%%%,*} %p"
 


@@ -211,10 +203,6 @@ Host tethered-sgs7e
 
 ### LOCAL VIRT HOSTS
 
 
 ### LOCAL VIRT HOSTS
 

-Host wafer.virt
-  RemoteForward 25000 localhost:25
-  ForwardX11 yes
-

 Host red | green | blue | yellow | black | white | orange | violet | wafer
   CanonicalDomains virt
   CanonicalizeHostname yes
 Host red | green | blue | yellow | black | white | orange | violet | wafer
   CanonicalDomains virt
   CanonicalizeHostname yes