head	1.2;
access;
symbols
	RELENG_4_11_0_RELEASE:1.1.1.1
	RELENG_4_11:1.1.1.1.0.28
	RELENG_4_11_BP:1.1.1.1
	RELENG_4_10_0_RELEASE:1.1.1.1
	RELENG_4_10:1.1.1.1.0.26
	RELENG_4_10_BP:1.1.1.1
	RELENG_5_2_1_RELEASE:1.1.1.1
	RELENG_5_2_0_RELEASE:1.1.1.1
	RELENG_5_2:1.1.1.1.0.24
	RELENG_5_2_BP:1.1.1.1
	RELENG_4_9_0_RELEASE:1.1.1.1
	RELENG_4_9:1.1.1.1.0.22
	RELENG_4_9_BP:1.1.1.1
	isc_dhcp_3_0_1_rc12:1.1.1.1
	RELENG_5_1_0_RELEASE:1.1.1.1
	RELENG_5_1:1.1.1.1.0.20
	RELENG_5_1_BP:1.1.1.1
	RELENG_4_8_0_RELEASE:1.1.1.1
	RELENG_4_8:1.1.1.1.0.18
	RELENG_4_8_BP:1.1.1.1
	RELENG_5_0_0_RELEASE:1.1.1.1
	isc_dhcp_3_0_1_rc11:1.1.1.1
	isc_dhcp_3_0_1_rc10:1.1.1.1
	RELENG_5_0:1.1.1.1.0.16
	RELENG_5_0_BP:1.1.1.1
	RELENG_4_7_0_RELEASE:1.1.1.1
	RELENG_4_7:1.1.1.1.0.14
	RELENG_4_7_BP:1.1.1.1
	isc_dhcp_3_0_1_rc9:1.1.1.1
	RELENG_4_6_2_RELEASE:1.1.1.1
	RELENG_4_6_1_RELEASE:1.1.1.1
	RELENG_4_6_0_RELEASE:1.1.1.1
	RELENG_4_6:1.1.1.1.0.12
	RELENG_4_6_BP:1.1.1.1
	isc_dhcp_3_0_1_rc8:1.1.1.1
	isc_dhcp_3_0_1_rc6:1.1.1.1
	RELENG_4_5_0_RELEASE:1.1.1.1
	RELENG_4_5:1.1.1.1.0.10
	RELENG_4_5_BP:1.1.1.1
	RELENG_4_4_0_RELEASE:1.1.1.1
	RELENG_4_4:1.1.1.1.0.8
	RELENG_4_4_BP:1.1.1.1
	RELENG_4_3_0_RELEASE:1.1.1.1
	RELENG_4_3:1.1.1.1.0.6
	RELENG_4_3_BP:1.1.1.1
	RELENG_4_2_0_RELEASE:1.1.1.1
	FBSD_ISC_DHCP_2_0_PL5_+_V3_FIXES:1.1.1.1
	isc_dhcp_2_0_pl5_+_v3_fixes:1.1.1.1
	FBSD_ISC_DHCP_2_0_PL5:1.1.1.1
	isc_dhcp_2_0_pl5:1.1.1.1
	RELENG_4_1_1_RELEASE:1.1.1.1
	PRE_SMPNG:1.1.1.1
	RELENG_4_1_0_RELEASE:1.1.1.1
	isc_dhcp_2_0_pl3:1.1.1.1
	isc_dhcp_2_0_pl2:1.1.1.1
	isc_dhcp_2_0_pl1:1.1.1.1
	RELENG_3_5_0_RELEASE:1.1.1.1.2.1
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.4
	RELENG_4_BP:1.1.1.1
	RELENG_3_4_0_RELEASE:1.1.1.1.2.1
	RELENG_3_3_0_RELEASE:1.1.1.1.2.1
	isc_dhcp_2_0:1.1.1.1
	RELENG_3_2_PAO:1.1.1.1.2.1.0.2
	RELENG_3_2_PAO_BP:1.1.1.1.2.1
	RELENG_3_2_0_RELEASE:1.1.1.1.2.1
	isc_dhcp_2_0_b_1_pl_27:1.1.1.1
	isc_dhcp_2_0_b_1_pl_18:1.1.1.1
	isc_dhcp_2_0_b_1_pl_17:1.1.1.1
	RELENG_3:1.1.1.1.0.2
	isc_dhcp_2_0_b_1_pl_11:1.1.1.1
	isc_dhcp_2_0_b_1_pl_6: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	99.02.10.09.10.13;	author obrien;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.02.10.09.10.13;	author obrien;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	99.02.19.10.32.55;	author obrien;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Resolve conflicts.
@
text
@970609

- Don't trust hostnames provided by client - Win95 allows *spaces* in
  client-supplied hostnames!

- Be lenient in parsing client-hostname statement in case a bad hostname
  got recorded.

970607

- Change size_t to ssize_t in return values where a negative number
  is used to indicate an error.

- Always write out two digits for single-byte quantities in arrays.

- When parsing a lease database, correctly transfer the client
  hostname and hostname to the memory-resident lease structure.

- If the lease we want to give the client is different than the
  one it's asking for, and we recognize the one it's asking for as
  ours, NAK it.

- Only accept a DHCPRELEASE or DHCPNAK if the client supplies an IP
  address and the lease corresponding to that address is available to
  that client.

- Make it a warning rather than an error if resolv.conf is missing.

970605

- Add client-hostname token to lexer so that the parser can use it.
  Fixes a serious lease database bug.

- Disable log message on receipt of short ICMP Echo replies.

970602

- Added DHCP Client scripts for FreeBSD, Solaris, and Linux, but
  they're not guaranteed to work.

- Added some Cygwin32 (Windows NT/Windows 95) support, but this is not
  sufficiently complete to be useful yet.

- Updated README

- Put something useful in TODO - formerly it mostly listed projects
  that were way out on the back burner.

In DHCP Client:

- Add default, supersede, prepend and append option support, so that a
  client can override or modify server-supplied options, and provide
  default values if the server provides no values.

- Add reject keyword, so that packets from rogue DHCP or BOOTP servers
  can be rejected out of hand.

- Added support for booting from BOOTP servers.

- Added BOOTP flag to client lease declaration, to indicated that a
  particular lease was acquired through a BOOTP server.

- Don't try to do INIT-REBOOT on leases acquired from BOOTP servers.

- Print server's IP address instead of its IP address when logging
  DHCP/BOOTP messages received by client.

- Fix some bugs in saved lease activation.

- Fix some scripting bugs.

- New sample dhclient.conf script demonstrates new features.

In common code:

- Partially implemented asynchronous DNS lookups.

- Fixed some bugs in dispatch routine.

- Fix date parsing bug that was setting dates forward one day every
  time dhcpd was restarted (this has been fixed for a while in the 1.0
  branch).

- Change name-server option name to ien116-name-server so as to reduce
  the potential for confusion.

DHCP Relay daemon:

- Fixed an operator precedence bug having to do with the broadcast
  flag.

DHCP Server:

- Add support to record the client-supplied hostname in the lease file,
  for better readability.

- Fixed a bug in the renewal code that resulted in the server ignoring
  unicast renewals from non-local subnets.   This bug caused some
  heartburn for Win95 machines.

- Copy ciaddr from saved ciaddr, not from giaddr.

- New -t flag tests /etc/dhcpd.conf for syntax errors.

@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Virgin import of ISC-DHCP v2.0b1pl6
@
text
@@


1.1.1.1.2.1
log
@Mr. 3.1-STABLE, meet Ms. DHCP client
@
text
@@

