Date: Fri, 25 Feb 2000 23:31:56 -0800 (PST) From: Kris Kennaway <kris@FreeBSD.org> To: current@freebsd.org Cc: markm@freebsd.org Subject: OpenSSH /etc patch Message-ID: <Pine.BSF.4.21.0002252328510.71366-100000@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
Does this patch fix the problems people are seeing? It also generates the
hostkey if it doesnt exist.
Oops, the NO_DESCRYPT line in the /etc/defaults/make.conf patch shouldn't
be committed yet..I'm still testing that one.
Index: rc
===================================================================
RCS file: /home/ncvs/src/etc/rc,v
retrieving revision 1.211
diff -u -r1.211 rc
--- rc 2000/02/23 18:05:57 1.211
+++ rc 2000/02/26 07:18:54
@@ -301,6 +301,15 @@
;;
esac
+# Generate SSH host key, if it doesnt exist. Both sshd and ssh need it
+# so we do it unconditionally on sshd_enable.
+#
+if [ ! -f /etc/ssh/ssh_host_key -a -x /usr/bin/ssh-keygen ]; then
+ echo 'generating an SSH host key:'
+ /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
+ echo ' done.'
+fi
+
if [ -n "${network_pass2_done}" ]; then
network_pass3
fi
@@ -391,6 +400,15 @@
[Yy][Ee][Ss])
if [ -r /etc/mail/sendmail.cf ]; then
echo -n ' sendmail'; /usr/sbin/sendmail ${sendmail_flags}
+ fi
+ ;;
+esac
+
+case ${sshd_enable} in
+[Yy][Ee][Ss])
+ if [ -x ${sshd_program:-/usr/sbin/sshd} ]; then
+ echo -n ' sshd';
+ ${sshd_program:-/usr/sbin/sshd} ${sshd_flags}
fi
;;
esac
Index: rc.network
===================================================================
RCS file: /home/ncvs/src/etc/rc.network,v
retrieving revision 1.71
diff -u -r1.71 rc.network
--- rc.network 2000/02/24 23:12:04 1.71
+++ rc.network 2000/02/26 05:49:08
@@ -603,13 +603,6 @@
;;
esac
- case ${sshd_enable} in
- [Yy][Ee][Ss])
- echo -n ' sshd';
- ${sshd_program:-/usr/sbin/sshd} ${sshd_flags}
- ;;
- esac
-
echo '.'
network_pass3_done=YES
}
Index: defaults/make.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/make.conf,v
retrieving revision 1.92
diff -u -r1.92 make.conf
--- defaults/make.conf 2000/02/24 23:08:17 1.92
+++ defaults/make.conf 2000/02/26 05:56:04
@@ -27,10 +27,11 @@
#PERL_THREADED= true
#
# To avoid building various parts of the base system:
-#NO_SENDMAIL= true
#NO_CVS= true
+#NO_DESCRYPT= true # Don't build a DES libcrypt
#NO_OPENSSH= true
-#NO_OPENSSL= true
+#NO_OPENSSL= true # Implies NO_OPENSSH
+#NO_SENDMAIL= true
#
# To tell the base system that you are using RSAREF (from ports).
# (This needs revisiting) - it is very likely that this is too
Index: defaults/rc.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.51
diff -u -r1.51 rc.conf
--- defaults/rc.conf 2000/02/24 23:08:19 1.51
+++ defaults/rc.conf 2000/02/26 05:40:20
@@ -124,9 +124,9 @@
pppoed_provider="*" # Provider and ppp(8) config file entry.
pppoed_flags="-P /var/run/pppoed.pid" # Flags to pppoed (if enabled).
pppoed_interface="fxp0" # The interface that pppoed runs on.
-sshd_program="/usr/sbin/sshd" # path to sshd, if you want a different one.
-sshd_enable="NO" # Enable sshd
-sshd_flags="" # Additional flags for sshd.
+sshd_enable="NO" # Enable sshd, if installed.
+sshd_program="/usr/sbin/sshd" # Path to sshd, if you want a different one.
+sshd_flags="" # Flags to sshd (if enabled).
### Network Time Services options: ###
timed_enable="NO" # Run the time daemon (or NO).
Index: mtree/BSD.root.dist
===================================================================
RCS file: /home/ncvs/src/etc/mtree/BSD.root.dist,v
retrieving revision 1.45
diff -u -r1.45 BSD.root.dist
--- mtree/BSD.root.dist 2000/02/25 14:18:48 1.45
+++ mtree/BSD.root.dist 2000/02/26 07:19:44
@@ -28,8 +28,8 @@
monthly
..
..
- ssh
- ..
+ ssh
+ ..
ssl
..
gnats
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0002252328510.71366-100000>