diff options
author | Damien Miller <djm@mindrot.org> | 2003-11-21 23:48:55 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-11-21 23:48:55 +1100 |
commit | a8e06cef35c205e1aa562513c6d034a10c8c9a6d (patch) | |
tree | cf8bdb4466f553088c020b9179cabd6eaf196075 /contrib/caldera | |
parent | 8c5e91c03fdd2693f0635f8b2a9904bffc94ce16 (diff) |
- djm@cvs.openbsd.org 2003/11/21 11:57:03
[everything]
unexpand and delete whitespace at EOL; ok markus@
(done locally and RCS IDs synced)
Diffstat (limited to 'contrib/caldera')
-rwxr-xr-x | contrib/caldera/ssh-host-keygen | 8 | ||||
-rwxr-xr-x | contrib/caldera/sshd.init | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/contrib/caldera/ssh-host-keygen b/contrib/caldera/ssh-host-keygen index 28a97b9b4..3c5c17182 100755 --- a/contrib/caldera/ssh-host-keygen +++ b/contrib/caldera/ssh-host-keygen | |||
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # | 2 | # |
3 | # $Id: ssh-host-keygen,v 1.1 2001/04/27 05:50:50 tim Exp $ | 3 | # $Id: ssh-host-keygen,v 1.2 2003/11/21 12:48:57 djm Exp $ |
4 | # | 4 | # |
5 | # This script is normally run only *once* for a given host | 5 | # This script is normally run only *once* for a given host |
6 | # (in a given period of time) -- on updates/upgrades/recovery | 6 | # (in a given period of time) -- on updates/upgrades/recovery |
@@ -12,7 +12,7 @@ keydir=@sysconfdir@ | |||
12 | keygen=@sshkeygen@ | 12 | keygen=@sshkeygen@ |
13 | 13 | ||
14 | if [ -f $keydir/ssh_host_key -o \ | 14 | if [ -f $keydir/ssh_host_key -o \ |
15 | -f $keydir/ssh_host_key.pub ]; then | 15 | -f $keydir/ssh_host_key.pub ]; then |
16 | echo "You already have an SSH1 RSA host key in $keydir/ssh_host_key." | 16 | echo "You already have an SSH1 RSA host key in $keydir/ssh_host_key." |
17 | else | 17 | else |
18 | echo "Generating 1024 bit SSH1 RSA host key." | 18 | echo "Generating 1024 bit SSH1 RSA host key." |
@@ -20,7 +20,7 @@ else | |||
20 | fi | 20 | fi |
21 | 21 | ||
22 | if [ -f $keydir/ssh_host_rsa_key -o \ | 22 | if [ -f $keydir/ssh_host_rsa_key -o \ |
23 | -f $keydir/ssh_host_rsa_key.pub ]; then | 23 | -f $keydir/ssh_host_rsa_key.pub ]; then |
24 | echo "You already have an SSH2 RSA host key in $keydir/ssh_host_rsa_key." | 24 | echo "You already have an SSH2 RSA host key in $keydir/ssh_host_rsa_key." |
25 | else | 25 | else |
26 | echo "Generating 1024 bit SSH2 RSA host key." | 26 | echo "Generating 1024 bit SSH2 RSA host key." |
@@ -28,7 +28,7 @@ else | |||
28 | fi | 28 | fi |
29 | 29 | ||
30 | if [ -f $keydir/ssh_host_dsa_key -o \ | 30 | if [ -f $keydir/ssh_host_dsa_key -o \ |
31 | -f $keydir/ssh_host_dsa_key.pub ]; then | 31 | -f $keydir/ssh_host_dsa_key.pub ]; then |
32 | echo "You already have an SSH2 DSA host key in $keydir/ssh_host_dsa_key." | 32 | echo "You already have an SSH2 DSA host key in $keydir/ssh_host_dsa_key." |
33 | else | 33 | else |
34 | echo "Generating SSH2 DSA host key." | 34 | echo "Generating SSH2 DSA host key." |
diff --git a/contrib/caldera/sshd.init b/contrib/caldera/sshd.init index 90b36379a..983146f4f 100755 --- a/contrib/caldera/sshd.init +++ b/contrib/caldera/sshd.init | |||
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/bash | 1 | #! /bin/bash |
2 | # | 2 | # |
3 | # $Id: sshd.init,v 1.3 2001/11/03 19:09:33 tim Exp $ | 3 | # $Id: sshd.init,v 1.4 2003/11/21 12:48:57 djm Exp $ |
4 | # | 4 | # |
5 | ### BEGIN INIT INFO | 5 | ### BEGIN INIT INFO |
6 | # Provides: | 6 | # Provides: |
@@ -64,11 +64,11 @@ case "$1" in | |||
64 | SVIemptyConfig @sysconfdir@/sshd_config && exit 6 | 64 | SVIemptyConfig @sysconfdir@/sshd_config && exit 6 |
65 | 65 | ||
66 | if [ ! \( -f @sysconfdir@/ssh_host_key -a \ | 66 | if [ ! \( -f @sysconfdir@/ssh_host_key -a \ |
67 | -f @sysconfdir@/ssh_host_key.pub \) -a \ | 67 | -f @sysconfdir@/ssh_host_key.pub \) -a \ |
68 | ! \( -f @sysconfdir@/ssh_host_rsa_key -a \ | 68 | ! \( -f @sysconfdir@/ssh_host_rsa_key -a \ |
69 | -f @sysconfdir@/ssh_host_rsa_key.pub \) -a \ | 69 | -f @sysconfdir@/ssh_host_rsa_key.pub \) -a \ |
70 | ! \( -f @sysconfdir@/ssh_host_dsa_key -a \ | 70 | ! \( -f @sysconfdir@/ssh_host_dsa_key -a \ |
71 | -f @sysconfdir@/ssh_host_dsa_key.pub \) ]; then | 71 | -f @sysconfdir@/ssh_host_dsa_key.pub \) ]; then |
72 | 72 | ||
73 | echo "$SVIsubsys: host key not initialized: skipped!" | 73 | echo "$SVIsubsys: host key not initialized: skipped!" |
74 | echo "$SVIsubsys: use ssh-host-keygen to generate one!" | 74 | echo "$SVIsubsys: use ssh-host-keygen to generate one!" |