View | Details | Raw Unified | Return to bug 2166 | Differences between
and this patch

Collapse All | Expand All

(-)a/servconf.c (-8 / +12 lines)
Lines 168-183 fill_default_server_options(ServerOptions *options) Link Here
168
	if (options->num_host_key_files == 0) {
168
	if (options->num_host_key_files == 0) {
169
		/* fill default hostkeys for protocols */
169
		/* fill default hostkeys for protocols */
170
		if (options->protocol & SSH_PROTO_1)
170
		if (options->protocol & SSH_PROTO_1)
171
			options->host_key_files[options->num_host_key_files++] =
171
			if (access(_PATH_HOST_KEY_FILE, F_OK) == 0)
172
			    _PATH_HOST_KEY_FILE;
172
				options->host_key_files[options->num_host_key_files++] =
173
				   _PATH_HOST_KEY_FILE;
173
		if (options->protocol & SSH_PROTO_2) {
174
		if (options->protocol & SSH_PROTO_2) {
174
			options->host_key_files[options->num_host_key_files++] =
175
			if (access(_PATH_HOST_RSA_KEY_FILE, F_OK) == 0)
175
			    _PATH_HOST_RSA_KEY_FILE;
176
				options->host_key_files[options->num_host_key_files++] =
176
			options->host_key_files[options->num_host_key_files++] =
177
				    _PATH_HOST_RSA_KEY_FILE;
177
			    _PATH_HOST_DSA_KEY_FILE;
178
			if (access(_PATH_HOST_DSA_KEY_FILE, F_OK) == 0)
179
				options->host_key_files[options->num_host_key_files++] =
180
				    _PATH_HOST_DSA_KEY_FILE;
178
#ifdef OPENSSL_HAS_ECC
181
#ifdef OPENSSL_HAS_ECC
179
			options->host_key_files[options->num_host_key_files++] =
182
			if (access(_PATH_HOST_ECDSA_KEY_FILE, F_OK) == 0)
180
			    _PATH_HOST_ECDSA_KEY_FILE;
183
				options->host_key_files[options->num_host_key_files++] =
184
				    _PATH_HOST_ECDSA_KEY_FILE;
181
#endif
185
#endif
182
		}
186
		}
183
	}
187
	}

Return to bug 2166