Commit Graph

126 Commits

Author SHA1 Message Date
Murray Stokely
0b39641ad0 We now include the dhcpctl subdirectory. 2003-01-16 19:05:56 +00:00
David E. O'Brien
4bf463ac4d Update for the isc_dhcp_3_0_1_rc11 import. 2003-01-16 07:53:32 +00:00
David E. O'Brien
f68a4f4923 Use the stock version of this file -- all our needs have been taken care of. 2003-01-16 07:41:43 +00:00
David E. O'Brien
ee0e0df35c Make the "SEE ALSO" suitable for FreeBSD. 2003-01-16 07:36:45 +00:00
David E. O'Brien
6e38cc5509 Make isc_dhcp_3_0_1_rc11's "SEE ALSO" suitable for FreeBSD. 2003-01-16 07:31:49 +00:00
Murray Stokely
fc7a955609 This commit was generated by cvs2svn to compensate for changes in r109365,
which included commits to RCS files with non-trunk default branches.
2003-01-16 07:29:37 +00:00
Murray Stokely
e00b76de56 Import ISC DHCP 3.0.1 RC11 omshell interface. 2003-01-16 07:29:37 +00:00
David E. O'Brien
1888ca53cd Merge rev 1.6 (-D) and rev 1.8 (SEE ALSO suitable for FreeBSD) into
isc_dhcp_3_0_1_rc11.
2003-01-16 07:28:12 +00:00
David E. O'Brien
cf2acbc3a2 Make isc_dhcp_3_0_1_rc11's "SEE ALSO" suitable for FreeBSD. 2003-01-16 07:23:57 +00:00
David E. O'Brien
bd6635cff2 Merge rev 1.2 (correct script path) and 1.6 (prefer strlcpy to strcpy)
into isc_dhcp_3_0_1_rc11.
2003-01-16 07:22:32 +00:00
David E. O'Brien
42f38b97ae Merge our spelling changes into isc_dhcp_3_0_1_rc11. 2003-01-16 07:19:43 +00:00
David E. O'Brien
5ad7270f30 Import isc-dhcpd-3.0.1rc11.
This fixes a security vulnerability in the bundled resolver library.

Requested by:	scottl(re)
2003-01-16 07:04:57 +00:00
David E. O'Brien
41f294aba1 This commit was generated by cvs2svn to compensate for changes in r109357,
which included commits to RCS files with non-trunk default branches.
2003-01-16 07:04:57 +00:00
Murray Stokely
d4bba2e43d Resolve conflicts. 2003-01-15 10:47:32 +00:00
Murray Stokely
1593a68cca Resolve conflicts.
(import approved by: re)
2003-01-15 10:44:05 +00:00
Murray Stokely
8a71375ab6 Import ISC DHCP 3.0.1 RC10 client. 2003-01-15 10:31:26 +00:00
Murray Stokely
20f6de7220 This commit was generated by cvs2svn to compensate for changes in r109298,
which included commits to RCS files with non-trunk default branches.
2003-01-15 10:31:26 +00:00
Murray Stokely
117ed71ada Resolve conflicts (fix spelling errors). 2002-09-30 08:46:23 +00:00
Murray Stokely
d294e7fb70 Resolve conflicts. 2002-09-30 08:45:34 +00:00
Murray Stokely
c36726bfe1 Import ISC DHCP 3.0.1 RC9 client. 2002-09-30 08:39:27 +00:00
Murray Stokely
a41fa0fa20 This commit was generated by cvs2svn to compensate for changes in r104185,
which included commits to RCS files with non-trunk default branches.
2002-09-30 08:39:27 +00:00
Murray Stokely
f4626a61ae Document recent DHCP upgrade. 2002-04-01 08:44:51 +00:00
Murray Stokely
41156c80b5 Resolve conflicts. 2002-04-01 08:09:50 +00:00
Murray Stokely
d04685cfb2 Resolve conflicts:
* $FreeBSD$
  * connect std{in,out,err} (r1.19).
  * prefer strlcpy to strpy (r1.13).
  * quiet by default (r1.6).
  * document -D option.
2002-04-01 08:02:18 +00:00
Murray Stokely
09ba34e687 Resolve conflicts:
* $FreeBSD$ line.
  * Prefer strlcpy to strcpy (r1.6).
  * dhclient-script pathname.
2002-04-01 07:59:50 +00:00
Murray Stokely
33075c330b Import ISC DHCP 3.0.1 RC8 client. 2002-04-01 07:54:44 +00:00
Murray Stokely
7ca37d5578 This commit was generated by cvs2svn to compensate for changes in r93507,
which included commits to RCS files with non-trunk default branches.
2002-04-01 07:54:44 +00:00
Murray Stokely
7d8cb95f1c Add information about the 3.0.1RC6 upgrade. 2002-02-19 14:55:44 +00:00
Murray Stokely
a2f98fcc9e Resolve conflicts. Remove references to dhcpd from the man page,
since only the client exists in the base system.
2002-02-19 12:43:18 +00:00
Murray Stokely
eae30be95a Resolve conflicts. 2002-02-19 12:22:54 +00:00
Murray Stokely
edc4c2b49d Resolve conflicts.
* Note that option hostname is only honored if the hostname is not
    already set. (r1.2)
2002-02-19 12:15:09 +00:00
Murray Stokely
e51a769ab7 Resolve conflicts.
* Space the output consistently. (r1.19)
  * Use the cleaner "-n" syntax instead of comparing against "". (r1.17)
  * Fix arp invocation. (r1.13)
2002-02-19 12:10:40 +00:00
Murray Stokely
74a4b94fe6 Resolve conflicts.
* $FreeBSD$
  * Fix numerous typos.
  * Use correct path for dhclient-script.
2002-02-19 12:07:09 +00:00
Murray Stokely
727d8dcff2 Resolve conflicts.
* $FreeBSD$
  * connect std{in,out,err}. (r1.19)
  * prefer strlcpy to strpy. (r1.13)
  * quiet by default. (r1.6)
  * document -D option.
2002-02-19 12:04:29 +00:00
Murray Stokely
5e84f73d96 Resolve conflicts :
* $FreeBSD$ id, obrien copyright.
  * Document the -D option. (r1.6)
  * Correct man page reference and fix typo. (r1.8)

Reviewed by: obrien
2002-02-19 12:00:47 +00:00
Murray Stokely
92c4d51b6d Resolve conflicts :
* $FreeBSD$ line.
  * Remove dhcpd and dhcprelay from the SEE ALSO section, since these
    are not in the base system.
2002-02-19 11:57:47 +00:00
Murray Stokely
c31fe933fc Resolve conflicts :
* $FreeBSD$ line.
  * Prefer strlcpy to strcpy (r1.6).
  * dhclient-script pathname.
2002-02-19 11:55:09 +00:00
Murray Stokely
ce99b771f8 Import ISC DHCP 3.0.1 RC6 client. 2002-02-19 11:04:34 +00:00
Murray Stokely
4f80634345 This commit was generated by cvs2svn to compensate for changes in r90908,
which included commits to RCS files with non-trunk default branches.
2002-02-19 11:04:34 +00:00
Giorgos Keramidas
0063afffd5 dhclient-script.conf lives in /etc and not /sbin.
PR:		docs/32008
Submitted by:	John E Hein <jhein@timing.com>
Approved by:	obrien
2002-01-23 13:56:41 +00:00
David E. O'Brien
06cb5f26f7 Connect std{in,out,err} to *something* so that "hooks" scripts that write
to std{err,out} will not spam /etc/resolv.conf.

Ted Lemon fixed the problem in version 3 of the client, but only for the
pre-daemonized case.  Thanks to Brian for pointing that out and helping
to make our future dhclient (v3) better.

Submitted by:	brian
2001-07-16 01:56:48 +00:00
David E. O'Brien
393efa2bde Consistently space the output. 2001-03-31 09:26:03 +00:00
David E. O'Brien
c6c78b97ca * Consistently use the `make_resolv_conf' function.
* Better handling of the 127.0.0.1 route.
* Minor style tweak to reduce diffs from v3 script and ours.

Obtained from:	ISC v3 client script
2000-11-04 20:45:35 +00:00
David E. O'Brien
7657fb140f Import Patchlevel 5 of the ISC 2.0 dhcp client plus bug fixes from the
beta ISC DHCP version 3 offering.

In message http://www.isc.org/ml-archives/dhcp-client/2000/10/msg00001.html
author Ted Lemon stated "This will not be fixed in any 2.0 release - 2.0
is no longer being maintained." to a reported problem about an
interoperability problem against Microsoft servers.  FreeBSD went with the
ISC client vs. the WIDE client because others convinced me it was better
supported.  Sigh.  I wonder if version 3 will get the same treatment after
its release...

Since FreeBSD generally uses only released contrib products and the ISC
version 3 offering is still in beta, our backs are up against the wall.

The common/options.c rev 1.65 work around for erroneous Microsoft DHCP
servers has been back ported to the version 2.0pl5 client.  Since this
comes from a change in the vendor's own code (and would no doubt also be
committed to the version 2 client if the author were still supporting it),
we will consider this a vendor release and import this as such.

PR:	21658
Submitted by:	Motomichi Matsuzaki <mzaki@e-mail.ne.jp>
2000-11-04 20:14:55 +00:00
David E. O'Brien
235854e865 This commit was generated by cvs2svn to compensate for changes in r68325,
which included commits to RCS files with non-trunk default branches.
2000-11-04 20:14:55 +00:00
David E. O'Brien
7b9e3929de Fix conflicts. 2000-11-04 19:59:11 +00:00
David E. O'Brien
33abda25ac Import Patchlevel 5 of the ISC 2.0 dhcp client. 2000-11-04 19:57:10 +00:00
David E. O'Brien
148441e52a This commit was generated by cvs2svn to compensate for changes in r68320,
which included commits to RCS files with non-trunk default branches.
2000-11-04 19:57:10 +00:00
David E. O'Brien
4a0d94aa19 Fix conflicts. 2000-08-09 18:38:26 +00:00
David E. O'Brien
3b5006fdf4 Vendor approved fix where with some CIDR subnets, dhclient would set the
broadcast address to the [sub]net address.

Approved by:	Ted Lemon <mellon@nominum.com>
Submitted by:	Ben Smithurst <ben@scientia.demon.co.uk>
2000-08-09 18:37:31 +00:00