head	1.2;
access;
symbols
	RELENG_4_11_0_RELEASE:1.1.1.1.2.2
	RELENG_4_11:1.1.1.1.2.2.0.8
	RELENG_4_11_BP:1.1.1.1.2.2
	RELENG_4_10_0_RELEASE:1.1.1.1.2.2
	RELENG_4_10:1.1.1.1.2.2.0.6
	RELENG_4_10_BP:1.1.1.1.2.2
	RELENG_5_2_1_RELEASE:1.1.1.3
	RELENG_5_2_0_RELEASE:1.1.1.3
	RELENG_5_2:1.1.1.3.0.4
	RELENG_5_2_BP:1.1.1.3
	RELENG_4_9_0_RELEASE:1.1.1.1.2.2
	RELENG_4_9:1.1.1.1.2.2.0.4
	RELENG_4_9_BP:1.1.1.1.2.2
	isc_dhcp_3_0_1_rc12:1.1.1.3
	RELENG_5_1_0_RELEASE:1.1.1.3
	RELENG_5_1:1.1.1.3.0.2
	RELENG_5_1_BP:1.1.1.3
	RELENG_4_8_0_RELEASE:1.1.1.1.2.2
	RELENG_4_8:1.1.1.1.2.2.0.2
	RELENG_4_8_BP:1.1.1.1.2.2
	RELENG_5_0_0_RELEASE:1.1.1.1.4.1
	isc_dhcp_3_0_1_rc11:1.1.1.3
	isc_dhcp_3_0_1_rc10:1.1.1.2
	RELENG_5_0:1.1.1.1.0.4
	RELENG_5_0_BP:1.1.1.1
	RELENG_4_7_0_RELEASE:1.1.1.1.2.1
	RELENG_4_7:1.1.1.1.2.1.0.4
	RELENG_4_7_BP:1.1.1.1.2.1
	isc_dhcp_3_0_1_rc9:1.1.1.1
	RELENG_4_6_2_RELEASE:1.1.1.1.2.1
	RELENG_4_6_1_RELEASE:1.1.1.1.2.1
	RELENG_4_6_0_RELEASE:1.1.1.1.2.1
	RELENG_4_6:1.1.1.1.2.1.0.2
	RELENG_4_6_BP:1.1.1.1.2.1
	RELENG_4:1.1.1.1.0.2
	isc_dhcp_3_0_1_rc8:1.1.1.1
	isc_dhcp_3_0_1_rc6:1.1.1.1
	ISC:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2004.06.26.10.37.41;	author mbr;	state dead;
branches;
next	1.1;

1.1
date	2002.02.19.11.04.32;	author murray;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2002.02.19.11.04.32;	author murray;	state Exp;
branches
	1.1.1.1.2.1
	1.1.1.1.4.1;
next	1.1.1.2;

1.1.1.2
date	2003.01.15.10.31.02;	author murray;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2003.01.16.07.04.45;	author obrien;	state Exp;
branches;
next	;

1.1.1.1.2.1
date	2002.04.11.10.16.44;	author murray;	state Exp;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2003.03.02.16.42.37;	author murray;	state Exp;
branches;
next	;

1.1.1.1.4.1
date	2003.01.16.07.59.31;	author obrien;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Resolve conflicts.
@
text
@/*
 * Copyright (c) 1996-1999 Internet Software Consortium.
 * Use is subject to license terms which appear in the file named
 * ISC-LICENSE that should have accompanied this file when you
 * received it.   If a file named ISC-LICENSE did not accompany this
 * file, or you are not sure the one you have is correct, you may
 * obtain an applicable copy of the license at:
 *
 *             http://www.isc.org/isc-license-1.0.html. 
 *
 * This file is part of the ISC DHCP distribution.   The documentation
 * associated with this file is listed in the file DOCUMENTATION,
 * included in the top-level directory of this release.
 *
 * Support and other services are available for ISC products - see
 * http://www.isc.org for more information.
 */
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import ISC DHCP 3.0.1 RC6 client.
@
text
@@


1.1.1.1.4.1
log
@MFC: isc_dhcp_3_0_1_rc11

Approved by:	scottl(re)
@
text
@d2 1
a2 1
 * Copyright (c) 1996-2003 Internet Software Consortium.
@


1.1.1.2
log
@Import ISC DHCP 3.0.1 RC10 client.
@
text
@d2 1
a2 1
 * Copyright (c) 1996-2002 Internet Software Consortium.
@


1.1.1.3
log
@Import isc-dhcpd-3.0.1rc11.
This fixes a security vulnerability in the bundled resolver library.

Requested by:	scottl(re)
@
text
@d2 1
a2 1
 * Copyright (c) 1996-2003 Internet Software Consortium.
@


1.1.1.1.2.1
log
@MFC: DHCP 3.0.1 RC8
@
text
@@


1.1.1.1.2.2
log
@MFC: ISC DHCP 3.0.1 RC11

Approved by:  re (scottl)
@
text
@d2 1
a2 1
 * Copyright (c) 1996-2003 Internet Software Consortium.
@


