mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-05 11:35:01 +00:00
Code Issues Releases Activity

update to 3.0b2pl18.

Browse Source 
PR:		25501
Submitted by:	maintainer
This commit is contained in:
FUJISHIMA Satsuki 2001-03-08 20:06:36 +00:00
parent 9146f0a5e7
commit 922183a077
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=39288
20 changed files with 115 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/isc-dhcp3-server/Makefile
View File

@ -7,9 +7,9 @@
#
PORTNAME= isc-dhcp3
PORTVERSION= 3.0.b2.16
PORTVERSION= 3.0.b2.18
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
DISTNAME= ${PORTNAME:S/isc-//:S/3/-/}${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
MAINTAINER= clefevre@poboxes.com
@ -30,7 +30,7 @@ MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
# Local variables
#
PATCH_SUBDIRS= client common dhcpctl minires omapip relay server
PATCH_SUBDIRS= client common dhcpctl dst minires omapip relay server
BIN_FILES= dhclient dhcpd dhcrelay
SAMP_FILES= client/dhclient.conf server/dhcpd.conf

2
net/isc-dhcp3-server/distinfo
View File

@ -1 +1 @@
MD5 (dhcp-3.0b2pl16.tar.gz) = 88fb65480a1b66c8d011957ea6c2e138
MD5 (dhcp-3.0b2pl18.tar.gz) = 807485e8f6f6ad9028201b9f22354b3e

5
net/isc-dhcp3-server/files/isc-dhcpd.sh.sample
View File

@ -3,7 +3,7 @@
# $FreeBSD$
OPTIONS=""
IFACES="SET_THIS"
IFACES=""
if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
echo "$0: Cannot determine the PREFIX" >&2
@ -12,7 +12,8 @@ fi
case "$1" in
start)
${PREFIX}/sbin/dhcpd $OPTIONS $IFACES
${PREFIX}/sbin/dhcpd $OPTIONS $IFACES > /dev/null 2>&1
echo -n ' dhcpd'
;;
stop)
killall dhcpd

38
net/isc-dhcp3-server/files/patch-dhclient.c
View File

@ -1,14 +1,14 @@
--- client/dhclient.c.orig Thu Jan 25 09:18:06 2001
+++ client/dhclient.c Fri Jan 26 06:15:50 2001
--- client/dhclient.c.orig Thu Feb 15 23:17:05 2001
+++ client/dhclient.c Fri Mar 2 05:51:43 2001
@@ -78,6 +78,7 @@
u_int16_t remote_port;
int no_daemon;
int save_scripts;
+int onetry;
struct string_list *client_env;
int client_env_count;
static void usage PROTO ((void));
@@ -104,6 +105,7 @@
@@ -106,6 +107,7 @@
int no_dhclient_conf = 0;
int no_dhclient_db = 0;
int no_dhclient_pid = 0;
@ -16,7 +16,7 @@
char *s;
#ifdef SYSLOG_4_2
@@ -159,6 +161,11 @@
@@ -161,6 +163,13 @@
usage ();
path_dhclient_db = argv [i];
no_dhclient_db = 1;
@ -25,19 +25,12 @@
+ usage ();
+ client_script_name = argv [i];
+ no_dhclient_script = 1;
+ } else if (!strcmp (argv [i], "-1")) {
+ onetry = 1;
} else if (!strcmp (argv [i], "-q")) {
quiet = 1;
quiet_interface_discovery = 1;
@@ -176,6 +183,8 @@
} else if (!strcmp (argv [i], "-w")) {
/* do not exit if there are no broadcast interfaces. */
persist = 1;
+ } else if (!strcmp (argv [i], "-1")) {
+ onetry = 1;
} else if (argv [i][0] == '-') {
usage ();
} else {
@@ -208,6 +217,9 @@
@@ -224,6 +233,9 @@
if (!no_dhclient_pid && (s = getenv ("PATH_DHCLIENT_PID"))) {
path_dhclient_pid = s;
}
@ -47,22 +40,23 @@
/* first kill of any currently running client */
if (release_mode) {
@@ -423,10 +435,11 @@
@@ -445,10 +457,12 @@
log_info (arr);
log_info (url);
- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
+ log_error ("usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
+ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
"[-s server]");
- log_fatal (" [-lf lease-file] [-pf pid-file]%s",
- "[-cf config-file] [interface]");
- "[-cf config-file] [interface] [-e VAR=val]");
+ log_error (" [-cf config-file] [-lf lease-file] %s",
+ "[-pf pid-file] [-sf script-file]");
+ log_fatal (" [interface]");
+ "[-pf pid-file]");
+ log_fatal (" [-sf script-file] [interface] %s",
+ "[-e VAR=val]");
}
isc_result_t find_class (struct class **c,
@@ -1432,6 +1445,10 @@
@@ -1453,6 +1467,10 @@
/* No leases were available, or what was available didn't work, so
tell the shell script that we failed to allocate an address,
and try again later. */

6
net/isc-dhcp3/Makefile
View File

@ -7,9 +7,9 @@
#
PORTNAME= isc-dhcp3
PORTVERSION= 3.0.b2.16
PORTVERSION= 3.0.b2.18
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
DISTNAME= ${PORTNAME:S/isc-//:S/3/-/}${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
MAINTAINER= clefevre@poboxes.com
@ -30,7 +30,7 @@ MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
# Local variables
#
PATCH_SUBDIRS= client common dhcpctl minires omapip relay server
PATCH_SUBDIRS= client common dhcpctl dst minires omapip relay server
BIN_FILES= dhclient dhcpd dhcrelay
SAMP_FILES= client/dhclient.conf server/dhcpd.conf

2
net/isc-dhcp3/distinfo
View File

@ -1 +1 @@
MD5 (dhcp-3.0b2pl16.tar.gz) = 88fb65480a1b66c8d011957ea6c2e138
MD5 (dhcp-3.0b2pl18.tar.gz) = 807485e8f6f6ad9028201b9f22354b3e

5
net/isc-dhcp3/files/isc-dhcpd.sh.sample
View File

@ -3,7 +3,7 @@
# $FreeBSD$
OPTIONS=""
IFACES="SET_THIS"
IFACES=""
if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
echo "$0: Cannot determine the PREFIX" >&2
@ -12,7 +12,8 @@ fi
case "$1" in
start)
${PREFIX}/sbin/dhcpd $OPTIONS $IFACES
${PREFIX}/sbin/dhcpd $OPTIONS $IFACES > /dev/null 2>&1
echo -n ' dhcpd'
;;
stop)
killall dhcpd

38
net/isc-dhcp3/files/patch-dhclient.c
View File

@ -1,14 +1,14 @@
--- client/dhclient.c.orig Thu Jan 25 09:18:06 2001
+++ client/dhclient.c Fri Jan 26 06:15:50 2001
--- client/dhclient.c.orig Thu Feb 15 23:17:05 2001
+++ client/dhclient.c Fri Mar 2 05:51:43 2001
@@ -78,6 +78,7 @@
u_int16_t remote_port;
int no_daemon;
int save_scripts;
+int onetry;
struct string_list *client_env;
int client_env_count;
static void usage PROTO ((void));
@@ -104,6 +105,7 @@
@@ -106,6 +107,7 @@
int no_dhclient_conf = 0;
int no_dhclient_db = 0;
int no_dhclient_pid = 0;
@ -16,7 +16,7 @@
char *s;
#ifdef SYSLOG_4_2
@@ -159,6 +161,11 @@
@@ -161,6 +163,13 @@
usage ();
path_dhclient_db = argv [i];
no_dhclient_db = 1;
@ -25,19 +25,12 @@
+ usage ();
+ client_script_name = argv [i];
+ no_dhclient_script = 1;
+ } else if (!strcmp (argv [i], "-1")) {
+ onetry = 1;
} else if (!strcmp (argv [i], "-q")) {
quiet = 1;
quiet_interface_discovery = 1;
@@ -176,6 +183,8 @@
} else if (!strcmp (argv [i], "-w")) {
/* do not exit if there are no broadcast interfaces. */
persist = 1;
+ } else if (!strcmp (argv [i], "-1")) {
+ onetry = 1;
} else if (argv [i][0] == '-') {
usage ();
} else {
@@ -208,6 +217,9 @@
@@ -224,6 +233,9 @@
if (!no_dhclient_pid && (s = getenv ("PATH_DHCLIENT_PID"))) {
path_dhclient_pid = s;
}
@ -47,22 +40,23 @@
/* first kill of any currently running client */
if (release_mode) {
@@ -423,10 +435,11 @@
@@ -445,10 +457,12 @@
log_info (arr);
log_info (url);
- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
+ log_error ("usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
+ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
"[-s server]");
- log_fatal (" [-lf lease-file] [-pf pid-file]%s",
- "[-cf config-file] [interface]");
- "[-cf config-file] [interface] [-e VAR=val]");
+ log_error (" [-cf config-file] [-lf lease-file] %s",
+ "[-pf pid-file] [-sf script-file]");
+ log_fatal (" [interface]");
+ "[-pf pid-file]");
+ log_fatal (" [-sf script-file] [interface] %s",
+ "[-e VAR=val]");
}
isc_result_t find_class (struct class **c,
@@ -1432,6 +1445,10 @@
@@ -1453,6 +1467,10 @@
/* No leases were available, or what was available didn't work, so
tell the shell script that we failed to allocate an address,
and try again later. */

6
net/isc-dhcp30-server/Makefile
View File

@ -7,9 +7,9 @@
#
PORTNAME= isc-dhcp3
PORTVERSION= 3.0.b2.16
PORTVERSION= 3.0.b2.18
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
DISTNAME= ${PORTNAME:S/isc-//:S/3/-/}${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
MAINTAINER= clefevre@poboxes.com
@ -30,7 +30,7 @@ MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
# Local variables
#
PATCH_SUBDIRS= client common dhcpctl minires omapip relay server
PATCH_SUBDIRS= client common dhcpctl dst minires omapip relay server
BIN_FILES= dhclient dhcpd dhcrelay
SAMP_FILES= client/dhclient.conf server/dhcpd.conf

2
net/isc-dhcp30-server/distinfo
View File

@ -1 +1 @@
MD5 (dhcp-3.0b2pl16.tar.gz) = 88fb65480a1b66c8d011957ea6c2e138
MD5 (dhcp-3.0b2pl18.tar.gz) = 807485e8f6f6ad9028201b9f22354b3e

5
net/isc-dhcp30-server/files/isc-dhcpd.sh.sample
View File

@ -3,7 +3,7 @@
# $FreeBSD$
OPTIONS=""
IFACES="SET_THIS"
IFACES=""
if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
echo "$0: Cannot determine the PREFIX" >&2
@ -12,7 +12,8 @@ fi
case "$1" in
start)
${PREFIX}/sbin/dhcpd $OPTIONS $IFACES
${PREFIX}/sbin/dhcpd $OPTIONS $IFACES > /dev/null 2>&1
echo -n ' dhcpd'
;;
stop)
killall dhcpd

38
net/isc-dhcp30-server/files/patch-dhclient.c
View File

@ -1,14 +1,14 @@
--- client/dhclient.c.orig Thu Jan 25 09:18:06 2001
+++ client/dhclient.c Fri Jan 26 06:15:50 2001
--- client/dhclient.c.orig Thu Feb 15 23:17:05 2001
+++ client/dhclient.c Fri Mar 2 05:51:43 2001
@@ -78,6 +78,7 @@
u_int16_t remote_port;
int no_daemon;
int save_scripts;
+int onetry;
struct string_list *client_env;
int client_env_count;
static void usage PROTO ((void));
@@ -104,6 +105,7 @@
@@ -106,6 +107,7 @@
int no_dhclient_conf = 0;
int no_dhclient_db = 0;
int no_dhclient_pid = 0;
@ -16,7 +16,7 @@
char *s;
#ifdef SYSLOG_4_2
@@ -159,6 +161,11 @@
@@ -161,6 +163,13 @@
usage ();
path_dhclient_db = argv [i];
no_dhclient_db = 1;
@ -25,19 +25,12 @@
+ usage ();
+ client_script_name = argv [i];
+ no_dhclient_script = 1;
+ } else if (!strcmp (argv [i], "-1")) {
+ onetry = 1;
} else if (!strcmp (argv [i], "-q")) {
quiet = 1;
quiet_interface_discovery = 1;
@@ -176,6 +183,8 @@
} else if (!strcmp (argv [i], "-w")) {
/* do not exit if there are no broadcast interfaces. */
persist = 1;
+ } else if (!strcmp (argv [i], "-1")) {
+ onetry = 1;
} else if (argv [i][0] == '-') {
usage ();
} else {
@@ -208,6 +217,9 @@
@@ -224,6 +233,9 @@
if (!no_dhclient_pid && (s = getenv ("PATH_DHCLIENT_PID"))) {
path_dhclient_pid = s;
}
@ -47,22 +40,23 @@
/* first kill of any currently running client */
if (release_mode) {
@@ -423,10 +435,11 @@
@@ -445,10 +457,12 @@
log_info (arr);
log_info (url);
- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
+ log_error ("usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
+ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
"[-s server]");
- log_fatal (" [-lf lease-file] [-pf pid-file]%s",
- "[-cf config-file] [interface]");
- "[-cf config-file] [interface] [-e VAR=val]");
+ log_error (" [-cf config-file] [-lf lease-file] %s",
+ "[-pf pid-file] [-sf script-file]");
+ log_fatal (" [interface]");
+ "[-pf pid-file]");
+ log_fatal (" [-sf script-file] [interface] %s",
+ "[-e VAR=val]");
}
isc_result_t find_class (struct class **c,
@@ -1432,6 +1445,10 @@
@@ -1453,6 +1467,10 @@
/* No leases were available, or what was available didn't work, so
tell the shell script that we failed to allocate an address,
and try again later. */

6
net/isc-dhcp31-server/Makefile
View File

@ -7,9 +7,9 @@
#
PORTNAME= isc-dhcp3
PORTVERSION= 3.0.b2.16
PORTVERSION= 3.0.b2.18
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
DISTNAME= ${PORTNAME:S/isc-//:S/3/-/}${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
MAINTAINER= clefevre@poboxes.com
@ -30,7 +30,7 @@ MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
# Local variables
#
PATCH_SUBDIRS= client common dhcpctl minires omapip relay server
PATCH_SUBDIRS= client common dhcpctl dst minires omapip relay server
BIN_FILES= dhclient dhcpd dhcrelay
SAMP_FILES= client/dhclient.conf server/dhcpd.conf

2
net/isc-dhcp31-server/distinfo
View File

@ -1 +1 @@
MD5 (dhcp-3.0b2pl16.tar.gz) = 88fb65480a1b66c8d011957ea6c2e138
MD5 (dhcp-3.0b2pl18.tar.gz) = 807485e8f6f6ad9028201b9f22354b3e

5
net/isc-dhcp31-server/files/isc-dhcpd.sh.sample
View File

@ -3,7 +3,7 @@
# $FreeBSD$
OPTIONS=""
IFACES="SET_THIS"
IFACES=""
if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
echo "$0: Cannot determine the PREFIX" >&2
@ -12,7 +12,8 @@ fi
case "$1" in
start)
${PREFIX}/sbin/dhcpd $OPTIONS $IFACES
${PREFIX}/sbin/dhcpd $OPTIONS $IFACES > /dev/null 2>&1
echo -n ' dhcpd'
;;
stop)
killall dhcpd

38
net/isc-dhcp31-server/files/patch-dhclient.c
View File

@ -1,14 +1,14 @@
--- client/dhclient.c.orig Thu Jan 25 09:18:06 2001
+++ client/dhclient.c Fri Jan 26 06:15:50 2001
--- client/dhclient.c.orig Thu Feb 15 23:17:05 2001
+++ client/dhclient.c Fri Mar 2 05:51:43 2001
@@ -78,6 +78,7 @@
u_int16_t remote_port;
int no_daemon;
int save_scripts;
+int onetry;
struct string_list *client_env;
int client_env_count;
static void usage PROTO ((void));
@@ -104,6 +105,7 @@
@@ -106,6 +107,7 @@
int no_dhclient_conf = 0;
int no_dhclient_db = 0;
int no_dhclient_pid = 0;
@ -16,7 +16,7 @@
char *s;
#ifdef SYSLOG_4_2
@@ -159,6 +161,11 @@
@@ -161,6 +163,13 @@
usage ();
path_dhclient_db = argv [i];
no_dhclient_db = 1;
@ -25,19 +25,12 @@
+ usage ();
+ client_script_name = argv [i];
+ no_dhclient_script = 1;
+ } else if (!strcmp (argv [i], "-1")) {
+ onetry = 1;
} else if (!strcmp (argv [i], "-q")) {
quiet = 1;
quiet_interface_discovery = 1;
@@ -176,6 +183,8 @@
} else if (!strcmp (argv [i], "-w")) {
/* do not exit if there are no broadcast interfaces. */
persist = 1;
+ } else if (!strcmp (argv [i], "-1")) {
+ onetry = 1;
} else if (argv [i][0] == '-') {
usage ();
} else {
@@ -208,6 +217,9 @@
@@ -224,6 +233,9 @@
if (!no_dhclient_pid && (s = getenv ("PATH_DHCLIENT_PID"))) {
path_dhclient_pid = s;
}
@ -47,22 +40,23 @@
/* first kill of any currently running client */
if (release_mode) {
@@ -423,10 +435,11 @@
@@ -445,10 +457,12 @@
log_info (arr);
log_info (url);
- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
+ log_error ("usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
+ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
"[-s server]");
- log_fatal (" [-lf lease-file] [-pf pid-file]%s",
- "[-cf config-file] [interface]");
- "[-cf config-file] [interface] [-e VAR=val]");
+ log_error (" [-cf config-file] [-lf lease-file] %s",
+ "[-pf pid-file] [-sf script-file]");
+ log_fatal (" [interface]");
+ "[-pf pid-file]");
+ log_fatal (" [-sf script-file] [interface] %s",
+ "[-e VAR=val]");
}
isc_result_t find_class (struct class **c,
@@ -1432,6 +1445,10 @@
@@ -1453,6 +1467,10 @@
/* No leases were available, or what was available didn't work, so
tell the shell script that we failed to allocate an address,
and try again later. */

6
net/isc-dhcp40-server/Makefile
View File

@ -7,9 +7,9 @@
#
PORTNAME= isc-dhcp3
PORTVERSION= 3.0.b2.16
PORTVERSION= 3.0.b2.18
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/
DISTNAME= ${PORTNAME:S/isc-//:S/3/-/}${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E}
MAINTAINER= clefevre@poboxes.com
@ -30,7 +30,7 @@ MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8
# Local variables
#
PATCH_SUBDIRS= client common dhcpctl minires omapip relay server
PATCH_SUBDIRS= client common dhcpctl dst minires omapip relay server
BIN_FILES= dhclient dhcpd dhcrelay
SAMP_FILES= client/dhclient.conf server/dhcpd.conf

2
net/isc-dhcp40-server/distinfo
View File

@ -1 +1 @@
MD5 (dhcp-3.0b2pl16.tar.gz) = 88fb65480a1b66c8d011957ea6c2e138
MD5 (dhcp-3.0b2pl18.tar.gz) = 807485e8f6f6ad9028201b9f22354b3e

5
net/isc-dhcp40-server/files/isc-dhcpd.sh.sample
View File

@ -3,7 +3,7 @@
# $FreeBSD$
OPTIONS=""
IFACES="SET_THIS"
IFACES=""
if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
echo "$0: Cannot determine the PREFIX" >&2
@ -12,7 +12,8 @@ fi
case "$1" in
start)
${PREFIX}/sbin/dhcpd $OPTIONS $IFACES
${PREFIX}/sbin/dhcpd $OPTIONS $IFACES > /dev/null 2>&1
echo -n ' dhcpd'
;;
stop)
killall dhcpd

38
net/isc-dhcp40-server/files/patch-dhclient.c
View File

@ -1,14 +1,14 @@
--- client/dhclient.c.orig Thu Jan 25 09:18:06 2001
+++ client/dhclient.c Fri Jan 26 06:15:50 2001
--- client/dhclient.c.orig Thu Feb 15 23:17:05 2001
+++ client/dhclient.c Fri Mar 2 05:51:43 2001
@@ -78,6 +78,7 @@
u_int16_t remote_port;
int no_daemon;
int save_scripts;
+int onetry;
struct string_list *client_env;
int client_env_count;
static void usage PROTO ((void));
@@ -104,6 +105,7 @@
@@ -106,6 +107,7 @@
int no_dhclient_conf = 0;
int no_dhclient_db = 0;
int no_dhclient_pid = 0;
@ -16,7 +16,7 @@
char *s;
#ifdef SYSLOG_4_2
@@ -159,6 +161,11 @@
@@ -161,6 +163,13 @@
usage ();
path_dhclient_db = argv [i];
no_dhclient_db = 1;
@ -25,19 +25,12 @@
+ usage ();
+ client_script_name = argv [i];
+ no_dhclient_script = 1;
+ } else if (!strcmp (argv [i], "-1")) {
+ onetry = 1;
} else if (!strcmp (argv [i], "-q")) {
quiet = 1;
quiet_interface_discovery = 1;
@@ -176,6 +183,8 @@
} else if (!strcmp (argv [i], "-w")) {
/* do not exit if there are no broadcast interfaces. */
persist = 1;
+ } else if (!strcmp (argv [i], "-1")) {
+ onetry = 1;
} else if (argv [i][0] == '-') {
usage ();
} else {
@@ -208,6 +217,9 @@
@@ -224,6 +233,9 @@
if (!no_dhclient_pid && (s = getenv ("PATH_DHCLIENT_PID"))) {
path_dhclient_pid = s;
}
@ -47,22 +40,23 @@
/* first kill of any currently running client */
if (release_mode) {
@@ -423,10 +435,11 @@
@@ -445,10 +457,12 @@
log_info (arr);
log_info (url);
- log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s",
+ log_error ("usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
+ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s",
"[-s server]");
- log_fatal (" [-lf lease-file] [-pf pid-file]%s",
- "[-cf config-file] [interface]");
- "[-cf config-file] [interface] [-e VAR=val]");
+ log_error (" [-cf config-file] [-lf lease-file] %s",
+ "[-pf pid-file] [-sf script-file]");
+ log_fatal (" [interface]");
+ "[-pf pid-file]");
+ log_fatal (" [-sf script-file] [interface] %s",
+ "[-e VAR=val]");
}
isc_result_t find_class (struct class **c,
@@ -1432,6 +1445,10 @@
@@ -1453,6 +1467,10 @@
/* No leases were available, or what was available didn't work, so
tell the shell script that we failed to allocate an address,
and try again later. */