summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2000-02-24 23:12:04 +0000
committermarkm <markm@FreeBSD.org>2000-02-24 23:12:04 +0000
commit1b942b3840d42ed0285df9ce5acecc085d72a377 (patch)
tree8e202046e77fdb80578498386e580e48894261e3
parent27fe751781019519d2a2b6a7584e6ebb62683272 (diff)
downloadFreeBSD-src-1b942b3840d42ed0285df9ce5acecc085d72a377.zip
FreeBSD-src-1b942b3840d42ed0285df9ce5acecc085d72a377.tar.gz
Run sshd at boot time if the sysadmin wants it. Also install
ssh[d] config files in the right place.
-rw-r--r--etc/Makefile5
-rw-r--r--etc/network.subr7
-rw-r--r--etc/rc.d/netoptions7
-rw-r--r--etc/rc.d/network17
-rw-r--r--etc/rc.d/network27
-rw-r--r--etc/rc.d/network37
-rw-r--r--etc/rc.d/routing7
-rw-r--r--etc/rc.network7
8 files changed, 54 insertions, 0 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 6756cbb..513bfb2 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -20,6 +20,11 @@ BIN1= aliases amd.map apmd.conf auth.conf \
${.CURDIR}/../usr.bin/mail/misc/mail.rc \
${.CURDIR}/../usr.bin/locate/locate/locate.rc
+.if !defined(NO_OPENSSH)
+BIN1+= ${.CURDIR}/../crypto/openssh/ssh_config \
+ ${.CURDIR}/../crypto/openssh/sshd_config
+.endif
+
# -rwxr-xr-x root.wheel, for the new cron root.wheel
BIN2= netstart pccard_ether rc.suspend rc.resume
diff --git a/etc/network.subr b/etc/network.subr
index b42bd65..3b0771c 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -603,6 +603,13 @@ network_pass3() {
;;
esac
+ case ${sshd_enable} in
+ [Yy][Ee][Ss])
+ echo -n ' sshd';
+ ${sshd_program:-/usr/sbin/sshd} ${sshd_flags}
+ ;;
+ esac
+
echo '.'
network_pass3_done=YES
}
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index b42bd65..3b0771c 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -603,6 +603,13 @@ network_pass3() {
;;
esac
+ case ${sshd_enable} in
+ [Yy][Ee][Ss])
+ echo -n ' sshd';
+ ${sshd_program:-/usr/sbin/sshd} ${sshd_flags}
+ ;;
+ esac
+
echo '.'
network_pass3_done=YES
}
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index b42bd65..3b0771c 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -603,6 +603,13 @@ network_pass3() {
;;
esac
+ case ${sshd_enable} in
+ [Yy][Ee][Ss])
+ echo -n ' sshd';
+ ${sshd_program:-/usr/sbin/sshd} ${sshd_flags}
+ ;;
+ esac
+
echo '.'
network_pass3_done=YES
}
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index b42bd65..3b0771c 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -603,6 +603,13 @@ network_pass3() {
;;
esac
+ case ${sshd_enable} in
+ [Yy][Ee][Ss])
+ echo -n ' sshd';
+ ${sshd_program:-/usr/sbin/sshd} ${sshd_flags}
+ ;;
+ esac
+
echo '.'
network_pass3_done=YES
}
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index b42bd65..3b0771c 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -603,6 +603,13 @@ network_pass3() {
;;
esac
+ case ${sshd_enable} in
+ [Yy][Ee][Ss])
+ echo -n ' sshd';
+ ${sshd_program:-/usr/sbin/sshd} ${sshd_flags}
+ ;;
+ esac
+
echo '.'
network_pass3_done=YES
}
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index b42bd65..3b0771c 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -603,6 +603,13 @@ network_pass3() {
;;
esac
+ case ${sshd_enable} in
+ [Yy][Ee][Ss])
+ echo -n ' sshd';
+ ${sshd_program:-/usr/sbin/sshd} ${sshd_flags}
+ ;;
+ esac
+
echo '.'
network_pass3_done=YES
}
diff --git a/etc/rc.network b/etc/rc.network
index b42bd65..3b0771c 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -603,6 +603,13 @@ network_pass3() {
;;
esac
+ case ${sshd_enable} in
+ [Yy][Ee][Ss])
+ echo -n ' sshd';
+ ${sshd_program:-/usr/sbin/sshd} ${sshd_flags}
+ ;;
+ esac
+
echo '.'
network_pass3_done=YES
}
OpenPOWER on IntegriCloud