From 7a97339359a75e2dbf01edb27846a3bc113d50a8 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Fri, 12 Oct 2001 21:52:39 +0000 Subject: - (bal) Minor bug fix in contrib/solaris/opensshd.in .. $etcdir was not set right. --- ChangeLog | 4 +++- contrib/solaris/opensshd.in | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66f0d9023..e422d97cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,8 @@ - (bal) First wave of contrib/solaris/ package upgrades. Still more work needs to be done, but it is a 190% better then the stuff we had before! + - (bal) Minor bug fix in contrib/solaris/opensshd.in .. $etcdir was not + set right. 20011010 - (djm) OpenBSD CVS Sync @@ -6719,4 +6721,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1607 2001/10/12 20:30:52 mouring Exp $ +$Id: ChangeLog,v 1.1608 2001/10/12 21:52:39 mouring Exp $ diff --git a/contrib/solaris/opensshd.in b/contrib/solaris/opensshd.in index 057459b17..d1d573eb8 100755 --- a/contrib/solaris/opensshd.in +++ b/contrib/solaris/opensshd.in @@ -9,14 +9,14 @@ EGREP=/usr/bin/egrep KILL=/usr/bin/kill PS=/usr/bin/ps -PREFIX=%%openSSHDir%% -ETCDIR=%%configDir%% - -SSHD=$PREFIX/sbin/sshd -SSH_KEYGEN=$PREFIX/bin/ssh-keygen -HOST_KEY_RSA1=$ETCDIR/ssh_host_key -HOST_KEY_DSA=$ETCDIR/ssh_host_dsa_key -HOST_KEY_RSA=$ETCDIR/ssh_host_rsa_key +prefix=%%openSSHDir%% +etcdir=%%configDir%% + +SSHD=$prefix/sbin/sshd +SSH_KEYGEN=$prefix/bin/ssh-keygen +HOST_KEY_RSA1=$etcdir/ssh_host_key +HOST_KEY_DSA=$etcdir/ssh_host_dsa_key +HOST_KEY_RSA=$etcdir/ssh_host_rsa_key killproc() { _procname=$1 -- cgit v1.2.3