[Astlinux-commits] SF.net SVN: astlinux: [174] trunk/package/openssh

[<kr...@us...>]

Revision: 174
Author:   krisk84
Date:     2006-06-22 07:14:29 -0700 (Thu, 22 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/astlinux/?rev=174&view=rev

Log Message:
-----------
SSH and astfw updates

Modified Paths:
--------------
    trunk/package/openssh/sshd.init
    trunk/target/generic/target_skeleton/usr/sbin/astfw
Modified: trunk/package/openssh/sshd.init
===================================================================
--- trunk/package/openssh/sshd.init	2006-06-21 03:57:39 UTC (rev 173)
+++ trunk/package/openssh/sshd.init	2006-06-22 14:14:29 UTC (rev 174)
@@ -6,26 +6,6 @@
 mkdir /tmp/etc/ssh
 mkdir /var/run/sshd
 
-if [ -f /stat/etc/ssh/ssh_host_key ]
-then
-cp -a /stat/etc/ssh/* /etc/ssh/
-fi
-
-if [ -f /mnt/kd/ssh/ssh_host_key ]
-then
-cp -a /stat/etc/ssh/* /etc/ssh/
-cp -a /mnt/kd/ssh/* /etc/ssh/
-fi
-
-if [ ! -f /etc/ssh/ssh_host_key ]
-then
-cp -a /stat/etc/ssh/* /etc/ssh/
-echo "generating ssh hostkeys..."
-/usr/bin/ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N ''
-/usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N ''
-/usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-fi
-
 if [ "$SSHDPORT" ]
 then
 PORT="$SSHDPORT"
@@ -45,13 +25,33 @@
 ListenAddress 0.0.0.0
 PermitRootLogin $RSTAT
 
-Subsystem	sftp	/usr/sbin/sftp-server" > /tmp/etc/ssh/sshd_config
+Subsystem       sftp    /usr/sbin/sftp-server" > /tmp/etc/ssh/sshd_config
 
 if [ -r /etc/issue.net ]
 then
 echo "Banner /etc/issue.net" >> /tmp/etc/ssh/sshd_config
 fi
 
+if [ -f /stat/etc/ssh/ssh_host_key ]
+then
+cp -a /stat/etc/ssh/* /etc/ssh/
+fi
+
+if [ -f /mnt/kd/ssh/ssh_host_key ]
+then
+cp -a /stat/etc/ssh/* /etc/ssh/
+cp -a /mnt/kd/ssh/* /etc/ssh/
+fi
+
+if [ ! -f /etc/ssh/ssh_host_key ]
+then
+cp -a /stat/etc/ssh/* /etc/ssh/
+echo "generating ssh hostkeys..."
+/usr/bin/ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N ''
+/usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N ''
+/usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
+fi
+
 mkdir /root/.ssh
 
 if [ -d /stat/etc/ssh_keys ]

Modified: trunk/target/generic/target_skeleton/usr/sbin/astfw
===================================================================
--- trunk/target/generic/target_skeleton/usr/sbin/astfw	2006-06-21 03:57:39 UTC (rev 173)
+++ trunk/target/generic/target_skeleton/usr/sbin/astfw	2006-06-22 14:14:29 UTC (rev 174)
@@ -110,8 +110,20 @@
 PROTOCOL=tcp
 fi
 
+if `echo $i | grep -q "i"`
+then
+PROTOCOL=icmp
+fi
+
 PORT=`echo $i | tr -d itu`
+
+if [ "$PROTOCOL" = "icmp" ]
+then
+iptables -A INPUT -m icmp -p icmp --icmp-type $PORT -j ACCEPT
+else
 iptables -A INPUT -m state --state NEW -i $EXTIF -m $PROTOCOL -p $PROTOCOL --dport $PORT -j ACCEPT
+fi
+
 done
 fi
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.