diff options
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/solaris/opensshd.in | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/contrib/solaris/opensshd.in b/contrib/solaris/opensshd.in index 212254dc8..e7ca2489f 100755 --- a/contrib/solaris/opensshd.in +++ b/contrib/solaris/opensshd.in | |||
@@ -3,11 +3,8 @@ | |||
3 | # | 3 | # |
4 | # Stripped PRNGd out of it for the time being. | 4 | # Stripped PRNGd out of it for the time being. |
5 | 5 | ||
6 | AWK=/usr/bin/awk | ||
7 | CAT=/usr/bin/cat | 6 | CAT=/usr/bin/cat |
8 | KILL=/usr/bin/kill | 7 | KILL=/usr/bin/kill |
9 | PS=/usr/bin/ps | ||
10 | XARGS=/usr/bin/xargs | ||
11 | 8 | ||
12 | prefix=%%openSSHDir%% | 9 | prefix=%%openSSHDir%% |
13 | etcdir=%%configDir%% | 10 | etcdir=%%configDir%% |
@@ -20,12 +17,6 @@ HOST_KEY_RSA1=$etcdir/ssh_host_key | |||
20 | HOST_KEY_DSA=$etcdir/ssh_host_dsa_key | 17 | HOST_KEY_DSA=$etcdir/ssh_host_dsa_key |
21 | HOST_KEY_RSA=$etcdir/ssh_host_rsa_key | 18 | HOST_KEY_RSA=$etcdir/ssh_host_rsa_key |
22 | 19 | ||
23 | killproc() { | ||
24 | _procname=$1 | ||
25 | _signal=$2 | ||
26 | ${PS} -u root | ${AWK} '/'"$_procname"'$/ {print $1}' | ${XARGS} ${KILL} | ||
27 | } | ||
28 | |||
29 | 20 | ||
30 | checkkeys() { | 21 | checkkeys() { |
31 | if [ ! -f $HOST_KEY_RSA1 ]; then | 22 | if [ ! -f $HOST_KEY_RSA1 ]; then |
@@ -46,8 +37,7 @@ stop_service() { | |||
46 | if [ ${PID:=0} -gt 1 -a ! "X$PID" = "X " ]; then | 37 | if [ ${PID:=0} -gt 1 -a ! "X$PID" = "X " ]; then |
47 | ${KILL} ${PID} | 38 | ${KILL} ${PID} |
48 | else | 39 | else |
49 | echo "Unable to read PID file, killing using alternate method" | 40 | echo "Unable to read PID file" |
50 | killproc sshd TERM | ||
51 | fi | 41 | fi |
52 | } | 42 | } |
53 | 43 | ||