| servconf.c (538354481ef7dbcd76ebc7334512a9d60994b84e) | servconf.c (9ded33068ebc84932a4e78ecb1d5516698fa7144) |
|---|---|
| 1 2/* $OpenBSD: servconf.c,v 1.285 2016/02/17 05:29:04 djm Exp $ */ 3/* 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 5 * All rights reserved 6 * 7 * As far as I am concerned, the code I have written for this software 8 * can be used freely for any purpose. Any derived versions of this --- 192 unchanged lines hidden (view full) --- 201 202 /* Portable-specific options */ 203 if (options->use_pam == -1) 204 options->use_pam = 1; 205 206 /* Standard Options */ 207 if (options->protocol == SSH_PROTO_UNKNOWN) 208 options->protocol = SSH_PROTO_2; | 1 2/* $OpenBSD: servconf.c,v 1.285 2016/02/17 05:29:04 djm Exp $ */ 3/* 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 5 * All rights reserved 6 * 7 * As far as I am concerned, the code I have written for this software 8 * can be used freely for any purpose. Any derived versions of this --- 192 unchanged lines hidden (view full) --- 201 202 /* Portable-specific options */ 203 if (options->use_pam == -1) 204 options->use_pam = 1; 205 206 /* Standard Options */ 207 if (options->protocol == SSH_PROTO_UNKNOWN) 208 options->protocol = SSH_PROTO_2; |
| 209 if (options->protocol & SSH_PROTO_1) 210 error("WARNING: SSH protocol version 1 enabled"); | |
| 211 if (options->num_host_key_files == 0) { 212 /* fill default hostkeys for protocols */ 213 if (options->protocol & SSH_PROTO_1) 214 options->host_key_files[options->num_host_key_files++] = 215 _PATH_HOST_KEY_FILE; 216 if (options->protocol & SSH_PROTO_2) { 217 options->host_key_files[options->num_host_key_files++] = 218 _PATH_HOST_RSA_KEY_FILE; --- 2156 unchanged lines hidden --- | 209 if (options->num_host_key_files == 0) { 210 /* fill default hostkeys for protocols */ 211 if (options->protocol & SSH_PROTO_1) 212 options->host_key_files[options->num_host_key_files++] = 213 _PATH_HOST_KEY_FILE; 214 if (options->protocol & SSH_PROTO_2) { 215 options->host_key_files[options->num_host_key_files++] = 216 _PATH_HOST_RSA_KEY_FILE; --- 2156 unchanged lines hidden --- |