Deleted Added
full compact
options.c (229000) options.c (229778)
1/* $OpenBSD: options.c,v 1.15 2004/12/26 03:17:07 deraadt Exp $ */
2
3/* DHCP options parsing and reassembly. */
4
5/*
6 * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
7 * All rights reserved.
8 *

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

36 * This software has been written for the Internet Software Consortium
37 * by Ted Lemon <mellon@fugue.com> in cooperation with Vixie
38 * Enterprises. To learn more about the Internet Software Consortium,
39 * see ``http://www.vix.com/isc''. To learn more about Vixie
40 * Enterprises, see ``http://www.vix.com''.
41 */
42
43#include <sys/cdefs.h>
1/* $OpenBSD: options.c,v 1.15 2004/12/26 03:17:07 deraadt Exp $ */
2
3/* DHCP options parsing and reassembly. */
4
5/*
6 * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
7 * All rights reserved.
8 *

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

36 * This software has been written for the Internet Software Consortium
37 * by Ted Lemon <mellon@fugue.com> in cooperation with Vixie
38 * Enterprises. To learn more about the Internet Software Consortium,
39 * see ``http://www.vix.com/isc''. To learn more about Vixie
40 * Enterprises, see ``http://www.vix.com''.
41 */
42
43#include <sys/cdefs.h>
44__FBSDID("$FreeBSD: head/sbin/dhclient/options.c 229000 2011-12-30 14:33:08Z dumbbell $");
44__FBSDID("$FreeBSD: head/sbin/dhclient/options.c 229778 2012-01-07 16:09:33Z uqs $");
45
46#include <ctype.h>
47
48#define DHCP_OPTION_DATA
49#include "dhcpd.h"
50
51int bad_options = 0;
52int bad_options_max = 5;

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

279 "Search option.");
280 return (-1);
281 }
282
283 pointer = ((label_len & ~(0xC0)) << 8) +
284 option->data[i + 1];
285 if (pointer >= *offset) {
286 /*
45
46#include <ctype.h>
47
48#define DHCP_OPTION_DATA
49#include "dhcpd.h"
50
51int bad_options = 0;
52int bad_options_max = 5;

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

279 "Search option.");
280 return (-1);
281 }
282
283 pointer = ((label_len & ~(0xC0)) << 8) +
284 option->data[i + 1];
285 if (pointer >= *offset) {
286 /*
287 * The pointer must indicates a prior
288 * occurance.
287 * The pointer must indicate a prior
288 * occurrence.
289 */
290 warning("Invalid forward pointer in DHCP "
291 "Domain Search option compression.");
292 return (-1);
293 }
294
295 pointed_len = find_search_domain_name_len(option,
296 &pointer);

--- 598 unchanged lines hidden ---
289 */
290 warning("Invalid forward pointer in DHCP "
291 "Domain Search option compression.");
292 return (-1);
293 }
294
295 pointed_len = find_search_domain_name_len(option,
296 &pointer);

--- 598 unchanged lines hidden ---