From f1fa9ec9f6fe86d5e097c2c183870f79e1984396 Mon Sep 17 00:00:00 2001
From: veego <veego>
Date: Fri, 19 Oct 2001 09:42:08 +0000
Subject: Use @SSH_PID_DIR@. Generate ssh_host_rsa_key and use a newer syntax
 of ssh-keygen to create ssh_host_key and ssh_host_dsa_key.

---
 security/openssh/files/sshd.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'security')

diff --git a/security/openssh/files/sshd.sh b/security/openssh/files/sshd.sh
index acb43fca99c..c8d808f010f 100644
--- a/security/openssh/files/sshd.sh
+++ b/security/openssh/files/sshd.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: sshd.sh,v 1.5 2000/09/20 04:49:19 jlam Exp $
+# $NetBSD: sshd.sh,v 1.6 2001/10/19 09:42:08 veego Exp $
 #
 # PROVIDE: sshd
 # REQUIRE: DAEMON LOGIN
 
 name="sshd"
-pidfile="/var/run/${name}.pid"
+pidfile="@SSH_PID_DIR@/${name}.pid"
 
 command=${1:-start}
 
@@ -14,11 +14,15 @@ case ${command} in
 start)
 	if [ ! -f @SSH_CONF_DIR@/ssh_host_key ]
 	then
-		@PREFIX@/bin/ssh-keygen -b 1024 -N "" -f /etc/ssh_host_key
+		@PREFIX@/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh_host_key
+	fi
+	if [ ! -f @SSH_CONF_DIR@/ssh_host_rsa_key ]
+	then
+		@PREFIX@/bin/ssh-keygen -t rsa -N "" -f /etc/ssh_host_rsa_key
 	fi
 	if [ ! -f @SSH_CONF_DIR@/ssh_host_dsa_key ]
 	then
-		@PREFIX@/bin/ssh-keygen -d -N "" -f /etc/ssh_host_dsa_key
+		@PREFIX@/bin/ssh-keygen -t dsa -N "" -f /etc/ssh_host_dsa_key
 	fi
 	if [ -x @PREFIX@/sbin/sshd -a -f @SSH_CONF_DIR@/sshd_config ]
 	then
-- 
cgit v1.2.3