aboutsummaryrefslogtreecommitdiff
path: root/contrib/isc-dhcp/client
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1999-06-23 23:40:02 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1999-06-23 23:40:02 +0000
commitf1b2a73d600a397664f7e0bb0759d114e4bd9338 (patch)
tree1f762fde578b5005be25198c106c89beb9550ae2 /contrib/isc-dhcp/client
parentf96b6240a8bcccf45bd5180f78bf9512c3339a18 (diff)
downloadsrc-f1b2a73d600a397664f7e0bb0759d114e4bd9338.tar.gz
src-f1b2a73d600a397664f7e0bb0759d114e4bd9338.zip
Virgin import of ISC-DHCP v2.0
Notes
Notes: svn path=/vendor/isc-dhcp/dist/; revision=48146
Diffstat (limited to 'contrib/isc-dhcp/client')
-rw-r--r--contrib/isc-dhcp/client/dhclient-script.82
-rw-r--r--contrib/isc-dhcp/client/dhclient.c9
-rwxr-xr-xcontrib/isc-dhcp/client/scripts/freebsd2
3 files changed, 7 insertions, 6 deletions
diff --git a/contrib/isc-dhcp/client/dhclient-script.8 b/contrib/isc-dhcp/client/dhclient-script.8
index 51ccbe9c7da5..82212db6cf6d 100644
--- a/contrib/isc-dhcp/client/dhclient-script.8
+++ b/contrib/isc-dhcp/client/dhclient-script.8
@@ -61,7 +61,7 @@ to a particular computer should be done in the
.B ETCDIR/dhclient.conf
file. If you find that you can't make such a customization without
customizing
-.B ETCDIR/dhclient.conf
+.B dhclient-script
or using the enter and exit hooks, please submit a bug report.
.SH HOOKS
When it starts, the client script first defines a shell function,
diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c
index 9ac4aea17a8d..d904e7533461 100644
--- a/contrib/isc-dhcp/client/dhclient.c
+++ b/contrib/isc-dhcp/client/dhclient.c
@@ -56,10 +56,11 @@
#ifndef lint
static char ocopyright[] =
-"$Id: dhclient.c,v 1.44.2.37 1999/04/24 16:55:19 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
+"$Id: dhclient.c,v 1.44.2.39 1999/06/22 13:36:46 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
+#include "version.h"
TIME cur_time;
TIME default_lease_time = 43200; /* 12 hours... */
@@ -92,7 +93,7 @@ int save_scripts;
static char copyright[] =
"Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
static char arr [] = "All rights reserved.";
-static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl27";
+static char message [] = "Internet Software Consortium DHCP Client";
static char contrib [] = "Please contribute if you find this software useful.";
static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html";
@@ -109,7 +110,7 @@ int main (argc, argv, envp)
int quiet = 0;
char *s;
- s = strchr (argv [0], '/');
+ s = strrchr (argv [0], '/');
if (!s)
s = argv [0];
else
@@ -168,7 +169,7 @@ int main (argc, argv, envp)
}
if (!quiet) {
- note (message);
+ note ("%s %s", message, DHCP_VERSION);
note (copyright);
note (arr);
note ("");
diff --git a/contrib/isc-dhcp/client/scripts/freebsd b/contrib/isc-dhcp/client/scripts/freebsd
index d9e44b40d088..ce7a1bf25fbb 100755
--- a/contrib/isc-dhcp/client/scripts/freebsd
+++ b/contrib/isc-dhcp/client/scripts/freebsd
@@ -158,7 +158,7 @@ if [ x$reason = xTIMEOUT ]; then
sleep 1
if [ "$new_routers" != "" ]; then
set $new_routers
- if ping -q -c 1 -w 1 $1; then
+ if ping -q -c 1 $1; then
if [ x$new_ip_address != x$alias_ip_address ] && \
[ x$alias_ip_address != x ]; then
ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg