Merge from OPENSSH_3_8_1P1_GSSAPI_20040713 to OPENSSH_3_9P1_GSSAPI_20040818.

[gssapi-openssh.git] / openssh / opensshd.init.in

diff --git a/openssh/contrib/solaris/opensshd.in b/openssh/opensshd.init.in
similarity index 86%
rename from openssh/contrib/solaris/opensshd.in
rename to openssh/opensshd.init.in
index 50e18deea314ce98fbdbcf5b13a8ab9dcad5b578..ffa7cdac21ff970d3545d860e37ad658382df29d 100755 (executable)
--- a/openssh/contrib/solaris/opensshd.in
+++ b/openssh/opensshd.init.in
@@ -5,19 +5,19 @@
 
 umask 022
 
-CAT=/usr/bin/cat
-KILL=/usr/bin/kill
+CAT=@CAT@
+KILL=@KILL@
 
-prefix=%%openSSHDir%%
-etcdir=%%configDir%%
-piddir=%%pidDir%%
+prefix=@prefix@
+sysconfdir=@sysconfdir@
+piddir=@piddir@
 
 SSHD=$prefix/sbin/sshd
 PIDFILE=$piddir/sshd.pid
 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
+HOST_KEY_RSA1=$sysconfdir/ssh_host_key
+HOST_KEY_DSA=$sysconfdir/ssh_host_dsa_key
+HOST_KEY_RSA=$sysconfdir/ssh_host_rsa_key
 
 
 checkkeys() {