diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | servconf.c | 13 | ||||
-rw-r--r-- | sshd.8 | 26 |
3 files changed, 33 insertions, 12 deletions
@@ -88,6 +88,10 @@ | |||
88 | - stevesk@cvs.openbsd.org 2002/01/04 17:59:17 | 88 | - stevesk@cvs.openbsd.org 2002/01/04 17:59:17 |
89 | [readconf.c servconf.c] | 89 | [readconf.c servconf.c] |
90 | remove #ifdef _PATH_XAUTH/#endif; ok markus@ | 90 | remove #ifdef _PATH_XAUTH/#endif; ok markus@ |
91 | - stevesk@cvs.openbsd.org 2002/01/04 18:14:16 | ||
92 | [servconf.c sshd.8] | ||
93 | protocol 2 HostKey code default is now /etc/ssh_host_rsa_key and | ||
94 | /etc/ssh_host_dsa_key like we have in sshd_config. ok markus@ | ||
91 | 95 | ||
92 | 96 | ||
93 | 20020121 | 97 | 20020121 |
@@ -7236,4 +7240,4 @@ | |||
7236 | - Wrote replacements for strlcpy and mkdtemp | 7240 | - Wrote replacements for strlcpy and mkdtemp |
7237 | - Released 1.0pre1 | 7241 | - Released 1.0pre1 |
7238 | 7242 | ||
7239 | $Id: ChangeLog,v 1.1748 2002/01/22 12:18:49 djm Exp $ | 7243 | $Id: ChangeLog,v 1.1749 2002/01/22 12:19:11 djm Exp $ |
diff --git a/servconf.c b/servconf.c index e772cd46b..445d2da79 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.96 2002/01/04 17:59:17 stevesk Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.97 2002/01/04 18:14:16 stevesk Exp $"); |
14 | 14 | ||
15 | #if defined(KRB4) || defined(KRB5) | 15 | #if defined(KRB4) || defined(KRB5) |
16 | #include <krb.h> | 16 | #include <krb.h> |
@@ -124,9 +124,14 @@ fill_default_server_options(ServerOptions *options) | |||
124 | if (options->num_host_key_files == 0) { | 124 | if (options->num_host_key_files == 0) { |
125 | /* fill default hostkeys for protocols */ | 125 | /* fill default hostkeys for protocols */ |
126 | if (options->protocol & SSH_PROTO_1) | 126 | if (options->protocol & SSH_PROTO_1) |
127 | options->host_key_files[options->num_host_key_files++] = _PATH_HOST_KEY_FILE; | 127 | options->host_key_files[options->num_host_key_files++] = |
128 | if (options->protocol & SSH_PROTO_2) | 128 | _PATH_HOST_KEY_FILE; |
129 | options->host_key_files[options->num_host_key_files++] = _PATH_HOST_DSA_KEY_FILE; | 129 | if (options->protocol & SSH_PROTO_2) { |
130 | options->host_key_files[options->num_host_key_files++] = | ||
131 | _PATH_HOST_RSA_KEY_FILE; | ||
132 | options->host_key_files[options->num_host_key_files++] = | ||
133 | _PATH_HOST_DSA_KEY_FILE; | ||
134 | } | ||
130 | } | 135 | } |
131 | if (options->num_ports == 0) | 136 | if (options->num_ports == 0) |
132 | options->ports[options->num_ports++] = SSH_DEFAULT_PORT; | 137 | options->ports[options->num_ports++] = SSH_DEFAULT_PORT; |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd.8,v 1.159 2001/12/28 22:37:48 stevesk Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.160 2002/01/04 18:14:16 stevesk Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -208,12 +208,18 @@ If the client fails to authenticate the user within | |||
208 | this many seconds, the server disconnects and exits. | 208 | this many seconds, the server disconnects and exits. |
209 | A value of zero indicates no limit. | 209 | A value of zero indicates no limit. |
210 | .It Fl h Ar host_key_file | 210 | .It Fl h Ar host_key_file |
211 | Specifies the file from which the host key is read (default | 211 | Specifies a file from which a host key is read. |
212 | .Pa /etc/ssh_host_key ) . | ||
213 | This option must be given if | 212 | This option must be given if |
214 | .Nm | 213 | .Nm |
215 | is not run as root (as the normal | 214 | is not run as root (as the normal |
216 | host file is normally not readable by anyone but root). | 215 | host key files are normally not readable by anyone but root). |
216 | The default is | ||
217 | .Pa /etc/ssh_host_key | ||
218 | for protocol version 1, and | ||
219 | .Pa /etc/ssh_host_rsa_key | ||
220 | and | ||
221 | .Pa /etc/ssh_host_dsa_key | ||
222 | for protocol version 2. | ||
217 | It is possible to have multiple host key files for | 223 | It is possible to have multiple host key files for |
218 | the different protocol versions and host key algorithms. | 224 | the different protocol versions and host key algorithms. |
219 | .It Fl i | 225 | .It Fl i |
@@ -475,9 +481,15 @@ and applies to protocol version 2 only. | |||
475 | The default is | 481 | The default is |
476 | .Dq no . | 482 | .Dq no . |
477 | .It Cm HostKey | 483 | .It Cm HostKey |
478 | Specifies the file containing the private host keys (default | 484 | Specifies a file containing a private host key |
479 | .Pa /etc/ssh_host_key ) | 485 | used by SSH. |
480 | used by SSH protocol versions 1 and 2. | 486 | The default is |
487 | .Pa /etc/ssh_host_key | ||
488 | for protocol version 1, and | ||
489 | .Pa /etc/ssh_host_rsa_key | ||
490 | and | ||
491 | .Pa /etc/ssh_host_dsa_key | ||
492 | for protocol version 2. | ||
481 | Note that | 493 | Note that |
482 | .Nm | 494 | .Nm |
483 | will refuse to use a file if it is group/world-accessible. | 495 | will refuse to use a file if it is group/world-accessible. |