← Back to branch summary

~ubuntu-branches/ubuntu/lucid/dhcp3/lucid-security

« back to all changes in this revision

Viewing changes to client/clparse.c

  • Committer: Bazaar Package Importer
  • Author(s): Andrew Pollock
  • Date: 2009-10-07 23:25:53 UTC
  • mfrom: (1.2.9 upstream)
  • mto: This revision was merged to the branch mainline in revision 53.
  • Revision ID: james.westby@ubuntu.com-20091007232553-nsdu7jit2urg4jmy
Tags: 3.1.3-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/clparse.c
3
3
   Parser for dhclient config and lease files... */
4
4
 
5
5
/*
6
 
 * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
 
6
 * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
7
7
 * Copyright (c) 1996-2003 by Internet Software Consortium
8
8
 *
9
9
 * Permission to use, copy, modify, and distribute this software for any
22
22
 *   950 Charter Street
23
23
 *   Redwood City, CA 94063
24
24
 *   <info@isc.org>
25
 
 *   http://www.isc.org/
 
25
 *   https://www.isc.org/
26
26
 *
27
27
 * This software has been written for Internet Systems Consortium
28
28
 * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
29
29
 * To learn more about Internet Systems Consortium, see
30
 
 * ``http://www.isc.org/''.  To learn more about Vixie Enterprises,
 
30
 * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
31
31
 * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
32
32
 * ``http://www.nominum.com''.
33
33
 */
34
34
 
35
35
#ifndef lint
36
36
static char copyright[] =
37
 
"$Id: clparse.c,v 1.67.76.2 2007/02/14 22:41:22 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium.  All rights reserved.\n";
 
37
"$Id: clparse.c,v 1.67.76.5 2009/09/01 20:32:27 dhankins Exp $ Copyright (c) 2004-2009 Internet Systems Consortium.  All rights reserved.\n";
38
38
#endif /* not lint */
39
39
 
40
40
#include "dhcpd.h"
363
363
                        return;
364
364
                }
365
365
 
 
366
                known = 0;
366
367
                status = parse_option_name(cfile, 1, &known, &option);
367
368
                if (status != ISC_R_SUCCESS || option == NULL)
368
369
                        return;
382
383
                        option_dereference(&option, MDL);
383
384
                        return;
384
385
                }
 
386
 
 
387
                /*
 
388
                 * If the option was known, remove it from the code and name
 
389
                 * hash tables before redefining it.
 
390
                 */
 
391
                if (known) {
 
392
                        option_name_hash_delete(option->universe->name_hash,
 
393
                                                option->name, 0, MDL);
 
394
                        option_code_hash_delete(option->universe->code_hash,
 
395
                                                &option->code, 0, MDL);
 
396
                }
 
397
 
385
398
                parse_option_code_definition(cfile, option);
386
399
                option_dereference(&option, MDL);
387
400
                return;