diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
commit | 99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (patch) | |
tree | 1d24ce54c9981ea8cbb4c5a9309964a0e4c4b320 /sshd.c | |
parent | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (diff) | |
parent | 54af7a4ae8d455791a631bdfaade4b64436ae16a (diff) |
import openssh-5.2p1-gsskex-all-20090726.patch
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.364 2008/07/10 18:08:11 markus Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.366 2009/01/22 10:02:34 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -117,7 +117,6 @@ | |||
117 | #include "ssh-gss.h" | 117 | #include "ssh-gss.h" |
118 | #endif | 118 | #endif |
119 | #include "monitor_wrap.h" | 119 | #include "monitor_wrap.h" |
120 | #include "monitor_fdpass.h" | ||
121 | #include "version.h" | 120 | #include "version.h" |
122 | 121 | ||
123 | #ifdef USE_SECURITY_SESSION_API | 122 | #ifdef USE_SECURITY_SESSION_API |
@@ -1338,7 +1337,7 @@ main(int ac, char **av) | |||
1338 | exit(1); | 1337 | exit(1); |
1339 | } | 1338 | } |
1340 | options.ports[options.num_ports++] = a2port(optarg); | 1339 | options.ports[options.num_ports++] = a2port(optarg); |
1341 | if (options.ports[options.num_ports-1] == 0) { | 1340 | if (options.ports[options.num_ports-1] <= 0) { |
1342 | fprintf(stderr, "Bad port number.\n"); | 1341 | fprintf(stderr, "Bad port number.\n"); |
1343 | exit(1); | 1342 | exit(1); |
1344 | } | 1343 | } |
@@ -2305,9 +2304,11 @@ do_ssh2_kex(void) | |||
2305 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; | 2304 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; |
2306 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; | 2305 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; |
2307 | #ifdef GSSAPI | 2306 | #ifdef GSSAPI |
2308 | kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; | 2307 | if (options.gss_keyex) { |
2309 | kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; | 2308 | kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; |
2310 | kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; | 2309 | kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; |
2310 | kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; | ||
2311 | } | ||
2311 | #endif | 2312 | #endif |
2312 | kex->server = 1; | 2313 | kex->server = 1; |
2313 | kex->client_version_string=client_version_string; | 2314 | kex->client_version_string=client_version_string; |