Commit Graph

23 Commits

Author SHA1 Message Date
drochner ef869f8376 merge 3.0rc8 2001-06-18 19:01:50 +00:00
mellon b6b233a9ba Merge of 3.0b2pl23 2001-04-02 23:45:52 +00:00
taca 0cb6a7cf94 Merge 3.0b2pl9 with head. 2000-10-17 16:10:38 +00:00
mellon e59a2459c4 Merge 3.0b2pl2 with head. 2000-09-04 23:19:27 +00:00
mellon d1340e80d6 Fix conflicts in latest import. 2000-07-08 20:52:11 +00:00
mellon 11e02a2cec Merge latest version, fix conflicts. 2000-06-24 06:50:01 +00:00
mellon 582a2367ec Fix conflicts in merge. 2000-06-10 18:17:18 +00:00
thorpej d07c2b5b7e Fix a missing ~ which caused fixed-address leases to be treated like
normal leases, resulting in an eventual NULL-deref in supersede_lease().

Fixes PR #9976.
2000-04-26 23:11:20 +00:00
mellon e04a818808 Initial merge of ISC DHCP 3.0 into NetBSD tree (incomplete) 2000-04-22 08:18:11 +00:00
mellon 3c82a97a8d Merge with ISC source. 1999-04-26 15:47:03 +00:00
mellon 177a06d1a4 Resolve conflicts from Patchlevel 25 import. 1999-04-09 17:55:01 +00:00
mellon 579e9efdc7 Resolve conflicts in pl20 merge. 1999-03-29 23:08:21 +00:00
mellon 7ccf21d94d Fix conflicts in merge. 1999-03-26 17:52:45 +00:00
mellon 83ec6e889e Merge with 2.0b1pl18 1999-03-05 17:52:44 +00:00
mellon e7b0bff792 Resolve conflicts in 2.0b1pl15 1999-02-24 04:14:34 +00:00
mellon aa0c70bd9e Merge Patchlevel 14 with trunk. 1999-02-19 22:39:06 +00:00
mellon 2b8be45751 Resolve conflicts in 2.0b1pl13 import 1999-02-18 22:04:06 +00:00
sommerfe 6df264a8da Fix pr6874: add way to specify last resort filename 1999-01-25 22:31:45 +00:00
mellon 9f60f89a46 Version 2.0 Beta 1 Patchlevel 1 1998-05-18 06:53:52 +00:00
mellon 8f105dcd01 NetBSD 1.3 Alpha snapshot of ISC dhcp 1997-10-20 23:28:10 +00:00
mellon 2d333f8ed0 970607 snapshot 1997-06-08 04:53:30 +00:00
mellon 185e701358 970602 snapshot 1997-06-03 02:49:04 +00:00
mellon f5aacd55fe March 29 snapshot 1997-03-29 21:52:15 +00:00