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
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
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
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
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
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
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
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
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
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
David E. O'Brien
084059f84f
Use the cleaner "-n" syntax w/in [] rather then compare against `""'.
...
Submitted by: green
2000-07-28 09:20:39 +00:00
David E. O'Brien
df463686ea
Prevent 'set' from it interpreting the shell var as an argument.
...
Submitted by: green
2000-07-28 08:53:40 +00:00
David E. O'Brien
8e128180b2
The result of 'set' gives parameters starting with $1, not $0.
...
Submitted by: green
2000-07-28 08:46:08 +00:00
David E. O'Brien
cfcf9e97c9
Back out rev 1.12 (safe quoting) until I have a chance to rework the change
...
and get wider testing. Too many people are having problems with the
script in its current form.
2000-07-24 20:50:18 +00:00
David E. O'Brien
61203ed3a0
Fix vendor bogon where one of dhcp_option_ev_name()'s formal parameter
...
types did not match the prototype.
(Note: this is one bug that an Ada compiler would have found as when you
typedef a new type, the new type is not assignment compatabile with the
type used to make it up. C should only be so featureful.)
2000-07-20 19:51:37 +00:00
David E. O'Brien
e6d7feef80
Careful with long, command-line provided interface names.
...
Obtained from: OpenBSD (rev 1.5)
2000-07-20 09:56:18 +00:00
David E. O'Brien
11c898d281
arp(8) invocations fixed -- one does not use "-n" with "-d".
...
Obtained from: OpenBSD (rev 1.7)
2000-07-20 09:55:08 +00:00
David E. O'Brien
38234a80b2
safe shell quoting
...
Obtained from: OpenBSD (rev 1.6)
2000-07-20 09:53:10 +00:00
David E. O'Brien
6ad39c5859
Make sure we delete the PID file when we exit.
...
Obtained from: OpenBSD rev 1.3 (this semi-security fix was hidden as a
lease time fix)
2000-07-20 09:33:24 +00:00
David E. O'Brien
795cf8bb96
Add yet more options to usage() that the author did not document.
2000-07-20 09:16:30 +00:00
David E. O'Brien
4bb78bf510
Careful with long, command-line provided interface names.
...
Obtained from: OpenBSD (rev 1.7)
2000-07-20 08:57:29 +00:00
David E. O'Brien
3074027e68
Fix conflicts.
2000-07-20 08:44:53 +00:00
David E. O'Brien
134783f7a8
Import Patchlevel 3 of the ISC 2.0 dhcp client.
2000-07-20 08:36:42 +00:00
David E. O'Brien
46814e0b72
This commit was generated by cvs2svn to compensate for changes in r63616,
...
which included commits to RCS files with non-trunk default branches.
2000-07-20 08:36:42 +00:00
David E. O'Brien
346e95e237
Removed the doubled $FreeBSD$.
2000-06-26 23:02:56 +00:00
David E. O'Brien
613a51bf47
Merge in rev 1.2 ("-1"), and rev 1.6 (be quiet).
2000-06-26 08:21:15 +00:00
David E. O'Brien
ee4f4a92db
Import Patchlevel 1 of the ISC 2.0 dhcp client.
2000-06-26 08:06:22 +00:00
David E. O'Brien
41067f0457
This commit was generated by cvs2svn to compensate for changes in r62104,
...
which included commits to RCS files with non-trunk default branches.
2000-06-26 08:06:22 +00:00
David E. O'Brien
0b8f0431a4
Revert rev 1.10 as I took the bug report too much on face value. The bug
...
submitter has been refered to the ISC to determine if there his problems
are due to a bug in the script.
As a side note, `man 8 ifconfig' does not show "ifconfig -alias" as being
acceptable, but it is and does server a purpose.
2000-05-20 18:01:05 +00:00