X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fpkg%2Fopenssh;h=23f17380ab3c603df269c8127c1e220e3a9c79a3;hb=e7af14234a490713f91b3efbea721681bd4d0c1b;hp=726639d8acc8ada3425898edb97820e4b2c8c95c;hpb=9e3f8101a7e4d974db8e9afeb9c90c13a43ae8d7;p=hvlinux.git

diff --git a/stage3/pkg/openssh b/stage3/pkg/openssh
index 726639d..23f1738 100644
--- a/stage3/pkg/openssh
+++ b/stage3/pkg/openssh
@@ -5,8 +5,9 @@ hvconfig_pre()
     install -v -m700 -d /var/lib/sshd
     chown -v root:sys /var/lib/sshd
 
-    groupadd -f sshd
-    hv_useradd -c sshd-privsep -d /var/lib/sshd -g sshd -s /bin/false sshd
+    groupadd --system -f sshd
+    hv_useradd --system -c sshd-privsep -d /var/lib/sshd -g sshd \
+        -s /bin/false sshd
 
     CONFIGURE_OPTS="\
         ${CONFIGURE_OPTS} \
@@ -21,12 +22,15 @@ hvconfig_pre()
 hvbuild_post()
 {
     # Disabling root logins
-    sed -i -e "s!^#PermitRootLogin.*!PermitRootLogin no!g" /etc/ssh/sshd_config
+    sed -i -e "s!^#\(PermitRootLogin\).*!\1 no!g" /etc/ssh/sshd_config
 
     # Enabling X11 forwarding
-    sed -i -e "s!^#X11Forwarding.*!X11Forwarding yes!g" /etc/ssh/sshd_config
+    echo "XAuthLocation /usr/bin/xauth" >> /etc/ssh/sshd_config
+    sed -i -e "s!^#\(X11Forwarding\).*!\1 yes!g" /etc/ssh/sshd_config
+    sed -i -e "s!^#\(ForwardAgent\).*!\1 yes!g" /etc/ssh/ssh_config
+    sed -i -e "s!^#\(ForwardX11\).*!\1 yes!g" /etc/ssh/ssh_config
 
-    # Setting MaxAuthTries to 2
+    # Setting MaxAuthTries to 3
     sed -i -e "s!^[#]*MaxAuthTries.*!MaxAuthTries 3!g" /etc/ssh/sshd_config
 
     install -v -m740 ${SCRDIR}/bootscripts/sshd /etc/rc.d/init.d