12 Commits

Author SHA1 Message Date
mbr
4e40f399fe Resolve conflicts. 2004-06-26 10:37:42 +00:00
mbr
66b631bbce Resolve conflicts. 2003-09-02 11:13:21 +00:00
obrien
df429f4699 Centralize _PATH_* definitions.
Submitted by:	Tim Kientzle <kientzle@acm.org> (embellished by me)
2003-05-05 22:49:23 +00:00
obrien
e4b571b508 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
murray
dd19e39d2e Resolve conflicts:
* $FreeBSD$ line.
  * Prefer strlcpy to strcpy (r1.6).
  * dhclient-script pathname.
2002-04-01 07:59:50 +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
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
e71f7e5411 Fix conflicts. 2000-07-20 08:44:53 +00:00
obrien
d67781f126 Fix conflicts. 1999-05-02 09:24:16 +00:00
obrien
e09462d4aa fix conflicts 1999-02-11 12:49:40 +00:00
obrien
0f26402a3e use /sbin/dhclient-script rather than /etc/dhclient-script
Obtained from:	OpenBSD
1999-02-10 09:35:26 +00:00
obrien
117fbe9a9b Virgin import of ISC-DHCP v2.0b1pl6 1999-02-10 09:10:13 +00:00