ssh: T631: remove sshd config mangling

The configuration of SSHd is rendered from a template each time the service
changes. Thus it is not required that the boot process touches the config.

2 files changed, 0 insertions, 20 deletions

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 708251b3..352dcd98 100755
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -52,18 +52,6 @@ if [ "$sysconfdir" != "/etc" ]; then
     touch /etc/sudoers
     cp -p /etc/sudoers /etc/sudoers.bak
 
-    # enable ssh banner
-    sed -i 's/^#Banner/Banner/' /etc/ssh/sshd_config
-    # make sure PermitRoot is off
-    sed -i '/^PermitRootLogin/s/yes/no/' /etc/ssh/sshd_config
-    # make sure PasswordAuthentication is on
-    sed -i 's/^#PasswordAuthentication/PasswordAuthentication/' /etc/ssh/sshd_config
-    sed -i '/^PasswordAuthentication/s/no/yes/' /etc/ssh/sshd_config
-
-    # add UseDNS line
-    sed -i '/^UseDNS/d' /etc/ssh/sshd_config
-    echo 'UseDNS yes' >>/etc/ssh/sshd_config
-
     # cleanup any old entries in /etc/sudoers from previous versions
     sed -i /etc/sudoers \
 	-e '/### BEGIN VYATTA/,/### END VYATTA/d' \
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 458bf9da..a6d8d27a 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -167,14 +167,6 @@ security_reset () {
 
    # Disable root login over telnet
    sed -i -e '/^# Pseudo-terminal (telnet)/,$d' /etc/securetty
-
-   # Restore default sshd config
-   #  Disable root login with ssh
-   #  Renable DNS validation
-   #  Remove Listen addresses
-   sed -i -e '/^PermitRootLogin/s/yes/no/' \
-          -e '/^UseDNS/s/no/yes/' \
-	  -e '/^ListenAddress/d' /etc/ssh/sshd_config
 }
 
 start () {