murray
f4cfa354ba
Resolve conflicts.
2002-04-01 08:09:50 +00:00
murray
dbb6941311
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
dd19e39d2e
Resolve conflicts:
...
* $FreeBSD$ line.
* Prefer strlcpy to strcpy (r1.6).
* dhclient-script pathname.
2002-04-01 07:59:50 +00:00
murray
a916d35e05
Import ISC DHCP 3.0.1 RC8 client.
2002-04-01 07:54:44 +00:00
murray
36a33f96c7
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
3254728d11
Add information about the 3.0.1RC6 upgrade.
2002-02-19 14:55:44 +00:00
murray
dfedbefce8
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
0c707a43cc
Resolve conflicts.
2002-02-19 12:22:54 +00:00
murray
72e6b39049
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
c102a8d1ce
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
9d1c2f8591
Resolve conflicts.
...
* $FreeBSD$
* Fix numerous typos.
* Use correct path for dhclient-script.
2002-02-19 12:07:09 +00:00
murray
5f083a97c7
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
57ffe6bb01
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
e88884da62
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
cef39932ae
Resolve conflicts :
...
* $FreeBSD$ line.
* Prefer strlcpy to strcpy (r1.6).
* dhclient-script pathname.
2002-02-19 11:55:09 +00:00
murray
57b30d23e7
Import ISC DHCP 3.0.1 RC6 client.
2002-02-19 11:04:34 +00:00
murray
be711dcf1c
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
keramida
1c07280aca
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
obrien
facc2592c2
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
obrien
8b4d22a1bb
Consistently space the output.
2001-03-31 09:26:03 +00:00
obrien
8b6b9c21ab
* 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
obrien
7acb11388c
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
obrien
5080871f52
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
obrien
fc00659ff5
Fix conflicts.
2000-11-04 19:59:11 +00:00
obrien
68ee0aeb71
Import Patchlevel 5 of the ISC 2.0 dhcp client.
2000-11-04 19:57:10 +00:00
obrien
8daecf5e59
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
obrien
6a1679ea16
Fix conflicts.
2000-08-09 18:38:26 +00:00
obrien
8cabdcb94c
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
obrien
8338fbcc18
Use the cleaner "-n" syntax w/in [] rather then compare against `""'.
...
Submitted by: green
2000-07-28 09:20:39 +00:00
obrien
0c5a6efd0b
Prevent 'set' from it interpreting the shell var as an argument.
...
Submitted by: green
2000-07-28 08:53:40 +00:00
obrien
4ca463816f
The result of 'set' gives parameters starting with $1, not $0.
...
Submitted by: green
2000-07-28 08:46:08 +00:00
obrien
03da2cc1fd
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
obrien
982ec76a86
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
obrien
daec1ec7bf
Update to match the upgrade I just performed.
2000-07-20 10:07:13 +00:00
obrien
37aa29fabf
Careful with long, command-line provided interface names.
...
Obtained from: OpenBSD (rev 1.5)
2000-07-20 09:56:18 +00:00
obrien
847128d2b3
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
obrien
0b5fb9ae45
safe shell quoting
...
Obtained from: OpenBSD (rev 1.6)
2000-07-20 09:53:10 +00:00
obrien
0028a37058
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
obrien
d19be973db
Add yet more options to usage() that the author did not document.
2000-07-20 09:16:30 +00:00
obrien
93bac0087e
Careful with long, command-line provided interface names.
...
Obtained from: OpenBSD (rev 1.7)
2000-07-20 08:57:29 +00:00
obrien
e71f7e5411
Fix conflicts.
2000-07-20 08:44:53 +00:00
obrien
6c5ad02132
Import Patchlevel 3 of the ISC 2.0 dhcp client.
2000-07-20 08:36:42 +00:00
obrien
adb1918b06
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
obrien
5d4d7eb572
Import Patchlevel 2 of the ISC 2.0 dhcp client.
2000-07-03 18:44:09 +00:00
obrien
ba70f3eb4e
This commit was generated by cvs2svn to compensate for changes in r62475,
...
which included commits to RCS files with non-trunk default branches.
2000-07-03 18:44:09 +00:00
obrien
9b2c6ebcad
Change $FreeBSD$ placement.
2000-06-26 23:03:37 +00:00
obrien
845833effb
Removed the doubled $FreeBSD$.
2000-06-26 23:02:56 +00:00
obrien
b0ef5eef54
Merge in rev 1.2 ("-1"), and rev 1.6 (be quiet).
2000-06-26 08:21:15 +00:00
obrien
8bf3d0eae6
Import Patchlevel 1 of the ISC 2.0 dhcp client.
2000-06-26 08:06:22 +00:00
obrien
188abf10cc
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
obrien
b09b8d203d
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
obrien
9fe1120043
Our `ifconfig' syntax uses "alias" not "-alias".
...
Submitted by: Per Kristian Hove <Per.Hove@math.ntnu.no>
2000-05-20 17:47:06 +00:00
obrien
b7100c5789
Only log when there is a real change to the configuration state.
...
Requested and Tested by: unfurl
2000-01-15 22:46:40 +00:00
asmodai
d44028c3f5
Fix dhclient-exit-hooks location. (PR 14253)
...
Add $FreeBSD$ CVS identifier.
PR: 14253
Submitted by: Arcady Genkin
2000-01-13 16:27:20 +00:00
obrien
9e84904436
Do not add routes for localhost to the `dhclient' controlled interface.
...
Doing so is bogus if the loop-back interface was not configured.
Typically ``network_interfaces="auto"'' will return the list of
interfaces such that "lo0" is not first. Thus there are times when
`dhclient' configs an interface before "lo0" is configured.
Under BSD4.4, there's no need to add the above route, as it will be
automatically generated by the kernel.
PR: conf/14098, misc/15183
Submitted by: luoqi (true identification of the problem)
1999-12-12 01:04:36 +00:00
obrien
eb52c51753
Style nit.
1999-12-08 06:42:50 +00:00
obrien
1faaa28bba
Document what "X" in the table means.
1999-12-08 06:42:08 +00:00
obrien
65fb255e80
Add FreeBSD tag.
1999-09-08 11:16:36 +00:00
obrien
b8634127ec
Don't -ko anymore.
1999-09-08 11:12:35 +00:00
obrien
75ba4caabd
Document that dhclient-script will only set the hostname if it is unset.
...
Submitted by: John Baldwin <jobaldwi@vt.edu>
1999-09-02 05:15:26 +00:00
obrien
bf1e1d2a49
Check to see if /usr/bin/logger exists before using it. Use "echo" if
...
/usr/bin/logger is not available.
Noticed from: error messages in -CURRENT's sysinstall Alt-F2 debug screen
1999-08-10 07:16:00 +00:00
obrien
caa5450e65
Log hostname settings/changes.
...
Submitted by: John Baldwin <jobaldwi@vt.edu>
1999-08-04 15:12:27 +00:00
obrien
7eaa3130e0
Back out rev 1.2. The correct type of host-name is `X'. There was a problem
...
with options.c which was fixed in ISC's version 2.0 (rev 1.1.1.2 --> 1.1.1.3).
I have tested host-name with both types `X' and `t' and things work fine
either way. I would prefer to match the offical sources when easily possible.
PR: 12205
Submitted by: John Baldwin <jobaldwi@vt.edu>
1999-08-04 15:02:28 +00:00
obrien
272402a72f
MFS: use logger(1) instead of plain echo(1).
...
(some how these local changes made it out of my local tree into the
repository, so lets do it right)
1999-08-04 05:46:11 +00:00
obrien
83e5e22607
Support the setting of hostname via DHCP.
...
Submitted by: myself & Ted Lemon <mellon@isc.org>
1999-08-04 05:34:33 +00:00
nik
44986becca
dhclient-lease(8) -> dhclient.leases(5)
...
PR: docs/12619
Submitted by: Mikhail Teterin <mi@aldan.algebra.com>
1999-07-30 20:52:26 +00:00
nik
d7dde470bb
Correct reference to dhclient.conf(5) (was dhclient.conf(8)), as pointed
...
out in the PR. Correct typo on the same line, which was not pointed
out by the PR.
PR: docs/12619
Submitted by: Mikhail Teterin <mi@aldan.algebra.com>
1999-07-30 20:51:19 +00:00
jkh
65f03632d2
Fix type of host-name option. Partial fix for referenced PR.
...
Submitted by: John Baldwin <jobaldwi@vt.edu>
PR: 12205
1999-07-19 01:58:46 +00:00
obrien
87c4dbd66a
Sort options.
...
Add options in usage() not documented.
1999-06-25 22:31:47 +00:00
obrien
2d6635330f
Fix -1 (onetry) fails, exit(2) rather than exit(1) so an error from this
...
option is distingishable from other errors.
1999-06-25 22:28:34 +00:00
obrien
9cddb41c75
Clean up conflicts.
1999-06-24 04:38:03 +00:00
obrien
aea400fc2b
Update for latest vendor import.
1999-06-23 23:43:31 +00:00
obrien
bb7cda7445
Virgin import of ISC-DHCP v2.0
1999-06-23 23:40:02 +00:00
obrien
93376754d2
This commit was generated by cvs2svn to compensate for changes in r48146,
...
which included commits to RCS files with non-trunk default branches.
1999-06-23 23:40:02 +00:00
nik
61311c22af
Fix typo which causes an unnecessary line break.
...
PR: docs/11561
Submitted by: Norihiro Kumagai <kuma@nk.rim.or.jp>
1999-05-29 13:02:00 +00:00
jkoshy
1ec34cbf01
Fix spelling and typos.
...
PR: docs/11506
Submitted by: Norihiro Kumagai <kuma@jp.freebsd.org>
1999-05-06 12:17:58 +00:00
obrien
d67781f126
Fix conflicts.
1999-05-02 09:24:16 +00:00
obrien
33dc1bcbb6
junk from the last import
1999-05-02 09:22:01 +00:00
obrien
76664fd3c5
Virgin import of ISC-DHCP v2.0b1pl27
1999-05-02 09:03:51 +00:00
obrien
05d7eeab50
This commit was generated by cvs2svn to compensate for changes in r46275,
...
which included commits to RCS files with non-trunk default branches.
1999-05-02 09:03:51 +00:00
obrien
4f58b315f5
Document the "-D" option (UTSL).
1999-04-14 05:37:54 +00:00
obrien
8f6b9f8b2f
Did not mean to import these with 2.0b1pl17
...
(was the docs/ dir in previous ISC distfiles)
1999-04-09 18:51:21 +00:00
obrien
9a038f7924
Be quiet by default.
1999-04-02 17:19:19 +00:00
obrien
acd0aa4754
Our ping doesn't have the ``-w'' option.
...
Submitted by: Kevin Street <street@iname.com>
1999-03-30 21:21:23 +00:00
obrien
7395a30f20
fix conflicts.
1999-03-22 01:29:39 +00:00
obrien
c02dac0736
Update to latest version.
1999-03-22 01:28:54 +00:00
obrien
ec73946e9e
Virgin import of ISC-DHCP v2.0b1pl18
1999-03-22 01:26:43 +00:00
obrien
9dd3ba60a4
This commit was generated by cvs2svn to compensate for changes in r44930,
...
which included commits to RCS files with non-trunk default branches.
1999-03-22 01:26:43 +00:00
obrien
95711e23bb
fix conflicts
1999-02-28 20:44:08 +00:00
obrien
c009359b2f
Break a paragraph into two.
1999-02-28 20:43:33 +00:00
obrien
18f6fdbb5c
update for latest import
1999-02-28 20:36:31 +00:00
obrien
c4a13b4e0f
Virgin import of ISC-DHCP v2.0b1pl17
1999-02-28 20:34:40 +00:00
obrien
7a109504db
This commit was generated by cvs2svn to compensate for changes in r44335,
...
which included commits to RCS files with non-trunk default branches.
1999-02-28 20:34:40 +00:00
obrien
e09462d4aa
fix conflicts
1999-02-11 12:49:40 +00:00
obrien
a342fabba3
Virgin import of ISC-DHCP v2.0b1pl11
1999-02-11 12:40:22 +00:00
obrien
30f4701744
This commit was generated by cvs2svn to compensate for changes in r43892,
...
which included commits to RCS files with non-trunk default branches.
1999-02-11 12:40:22 +00:00
obrien
dcdd3a22bb
update for latest import
1999-02-11 12:39:45 +00:00
obrien
436c49a681
add -1 option: Try once, if we fail, EXIT
...
Obtained from: OpenBSD
1999-02-10 23:51:25 +00:00
obrien
1c3a691009
remove cruft I meant to remove
1999-02-10 21:23:48 +00:00
obrien
ff94f6a807
* fix paths in manpages
...
* sort references
1999-02-10 21:02:32 +00:00