Deleted Added
full compact
auth-options.c (146998) auth-options.c (147001)
1/*
2 * Author: Tatu Ylonen <ylo@cs.hut.fi>
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved
5 * As far as I am concerned, the code I have written for this software
6 * can be used freely for any purpose. Any derived versions of this
7 * software must be clearly marked as such, and if the derived work is
8 * incompatible with the protocol description in the RFC file, it must be
9 * called by a name other than "ssh" or "Secure Shell".
10 */
11
12#include "includes.h"
1/*
2 * Author: Tatu Ylonen <ylo@cs.hut.fi>
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved
5 * As far as I am concerned, the code I have written for this software
6 * can be used freely for any purpose. Any derived versions of this
7 * software must be clearly marked as such, and if the derived work is
8 * incompatible with the protocol description in the RFC file, it must be
9 * called by a name other than "ssh" or "Secure Shell".
10 */
11
12#include "includes.h"
13RCSID("$OpenBSD: auth-options.c,v 1.29 2005/03/01 10:09:52 djm Exp $");
13RCSID("$OpenBSD: auth-options.c,v 1.31 2005/03/10 22:40:38 deraadt Exp $");
14
15#include "xmalloc.h"
16#include "match.h"
17#include "log.h"
18#include "canohost.h"
19#include "channels.h"
20#include "auth-options.h"
21#include "servconf.h"

--- 220 unchanged lines hidden (view full) ---

242 goto bad_option;
243 }
244 patterns[i] = 0;
245 opts++;
246 p = patterns;
247 host = hpdelim(&p);
248 if (host == NULL || strlen(host) >= NI_MAXHOST) {
249 debug("%.100s, line %lu: Bad permitopen "
14
15#include "xmalloc.h"
16#include "match.h"
17#include "log.h"
18#include "canohost.h"
19#include "channels.h"
20#include "auth-options.h"
21#include "servconf.h"

--- 220 unchanged lines hidden (view full) ---

242 goto bad_option;
243 }
244 patterns[i] = 0;
245 opts++;
246 p = patterns;
247 host = hpdelim(&p);
248 if (host == NULL || strlen(host) >= NI_MAXHOST) {
249 debug("%.100s, line %lu: Bad permitopen "
250 "specification <%.100s>", file, linenum,
250 "specification <%.100s>", file, linenum,
251 patterns);
252 auth_debug_add("%.100s, line %lu: "
253 "Bad permitopen specification", file,
254 linenum);
255 xfree(patterns);
256 goto bad_option;
257 }
251 patterns);
252 auth_debug_add("%.100s, line %lu: "
253 "Bad permitopen specification", file,
254 linenum);
255 xfree(patterns);
256 goto bad_option;
257 }
258 host = cleanhostname(host);
259 if (p == NULL || (port = a2port(p)) == 0) {
258 host = cleanhostname(host);
259 if (p == NULL || (port = a2port(p)) == 0) {
260 debug("%.100s, line %lu: Bad permitopen port "
261 "<%.100s>", file, linenum, p ? p : "");
262 auth_debug_add("%.100s, line %lu: "
263 "Bad permitopen port", file, linenum);
264 xfree(patterns);
265 goto bad_option;
266 }
267 if (options.allow_tcp_forwarding)

--- 37 unchanged lines hidden ---
260 debug("%.100s, line %lu: Bad permitopen port "
261 "<%.100s>", file, linenum, p ? p : "");
262 auth_debug_add("%.100s, line %lu: "
263 "Bad permitopen port", file, linenum);
264 xfree(patterns);
265 goto bad_option;
266 }
267 if (options.allow_tcp_forwarding)

--- 37 unchanged lines hidden ---