1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-28 11:57:28 +00:00
Commit Graph

12 Commits

Author SHA1 Message Date
Martin Blapp
982a2c980e Resolve conflicts. 2004-06-26 10:37:42 +00:00
Martin Blapp
fb26c675fb Resolve conflicts. 2003-09-02 11:13:21 +00:00
David E. O'Brien
8d5c19ffbc Centralize _PATH_* definitions.
Submitted by:	Tim Kientzle <kientzle@acm.org> (embellished by me)
2003-05-05 22:49:23 +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
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
c31fe933fc Resolve conflicts :
* $FreeBSD$ line.
  * Prefer strlcpy to strcpy (r1.6).
  * dhclient-script pathname.
2002-02-19 11:55:09 +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
3074027e68 Fix conflicts. 2000-07-20 08:44:53 +00:00
David E. O'Brien
76505dc90c Fix conflicts. 1999-05-02 09:24:16 +00:00
David E. O'Brien
e34d6163df fix conflicts 1999-02-11 12:49:40 +00:00
David E. O'Brien
2cb713fbff use /sbin/dhclient-script rather than /etc/dhclient-script
Obtained from:	OpenBSD
1999-02-10 09:35:26 +00:00
David E. O'Brien
cd2d014aab Virgin import of ISC-DHCP v2.0b1pl6 1999-02-10 09:10:13 +00:00