diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
commit | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (patch) | |
tree | af8e928bd79d3f2d0219bb5b2c78b573ec31d94c /auth-options.c | |
parent | 9ad7b718d42e43f3a285fcbc8f91193931fce324 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
import openssh-4.2p1-gsskex-20050926-2.patch
Diffstat (limited to 'auth-options.c')
-rw-r--r-- | auth-options.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/auth-options.c b/auth-options.c index 04d12d66e..a85e40835 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth-options.c,v 1.29 2005/03/01 10:09:52 djm Exp $"); | 13 | RCSID("$OpenBSD: auth-options.c,v 1.31 2005/03/10 22:40:38 deraadt Exp $"); |
14 | 14 | ||
15 | #include "xmalloc.h" | 15 | #include "xmalloc.h" |
16 | #include "match.h" | 16 | #include "match.h" |
@@ -247,7 +247,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
247 | host = hpdelim(&p); | 247 | host = hpdelim(&p); |
248 | if (host == NULL || strlen(host) >= NI_MAXHOST) { | 248 | if (host == NULL || strlen(host) >= NI_MAXHOST) { |
249 | debug("%.100s, line %lu: Bad permitopen " | 249 | debug("%.100s, line %lu: Bad permitopen " |
250 | "specification <%.100s>", file, linenum, | 250 | "specification <%.100s>", file, linenum, |
251 | patterns); | 251 | patterns); |
252 | auth_debug_add("%.100s, line %lu: " | 252 | auth_debug_add("%.100s, line %lu: " |
253 | "Bad permitopen specification", file, | 253 | "Bad permitopen specification", file, |
@@ -255,8 +255,8 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
255 | xfree(patterns); | 255 | xfree(patterns); |
256 | goto bad_option; | 256 | goto bad_option; |
257 | } | 257 | } |
258 | host = cleanhostname(host); | 258 | host = cleanhostname(host); |
259 | if (p == NULL || (port = a2port(p)) == 0) { | 259 | if (p == NULL || (port = a2port(p)) == 0) { |
260 | debug("%.100s, line %lu: Bad permitopen port " | 260 | debug("%.100s, line %lu: Bad permitopen port " |
261 | "<%.100s>", file, linenum, p ? p : ""); | 261 | "<%.100s>", file, linenum, p ? p : ""); |
262 | auth_debug_add("%.100s, line %lu: " | 262 | auth_debug_add("%.100s, line %lu: " |