Commit Graph

23 Commits

Author SHA1 Message Date
Murray Stokely
1593a68cca Resolve conflicts.
(import approved by: re)
2003-01-15 10:44:05 +00:00
Murray Stokely
d294e7fb70 Resolve conflicts. 2002-09-30 08:45:34 +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
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
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
7b9e3929de Fix conflicts. 2000-11-04 19:59:11 +00:00
David E. O'Brien
4a0d94aa19 Fix conflicts. 2000-08-09 18:38:26 +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
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
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
5b4742f188 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
David E. O'Brien
40c963099f Clean up conflicts. 1999-06-24 04:38:03 +00:00
David E. O'Brien
76505dc90c Fix conflicts. 1999-05-02 09:24:16 +00:00
David E. O'Brien
fa33f391df Be quiet by default. 1999-04-02 17:19:19 +00:00
David E. O'Brien
fc8fc1d234 fix conflicts. 1999-03-22 01:29:39 +00:00
David E. O'Brien
7ec5041410 fix conflicts 1999-02-28 20:44:08 +00:00
David E. O'Brien
e34d6163df fix conflicts 1999-02-11 12:49:40 +00:00
David E. O'Brien
d2c596b2e7 add -1 option: Try once, if we fail, EXIT
Obtained from:	OpenBSD
1999-02-10 23:51:25 +00:00
David E. O'Brien
cd2d014aab Virgin import of ISC-DHCP v2.0b1pl6 1999-02-10 09:10:13 +00:00