d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflicts.

Browse Source
This commit is contained in:
obrien 1999-03-22 01:29:39 +00:00
parent c02dac0736
commit 7395a30f20
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/isc-dhcp/client/dhclient.8
View File

@ -124,6 +124,18 @@ standard (port 68), the
.B -p
flag may used. It should be followed by the udp port number that
dhclient should use. This is mostly useful for debugging purposes.
If the
.B -p
flag is specified, the client will transmit responses to servers at a
port number that is one less than the one specified - i.e., if you
specify
.B -p
68, then the client will listen on port 68 and transmit to port 67.
Datagrams that must go through relay agents are sent to the port
number specified with the
.B -p
flag - if you wish to use alternate port numbers, you must configure
any relay agents you are using to use the same alternate port numbers.
.PP
Dhclient will normally run in the foreground until it has configured
an interface, and then will revert to running in the background.

4
contrib/isc-dhcp/client/dhclient.c
View File

@ -56,7 +56,7 @@
#ifndef lint
static char ocopyright[] =
"$Id: dhclient.c,v 1.44.2.24 1999/02/27 21:51:35 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
"$Id: dhclient.c,v 1.44.2.25 1999/03/05 16:13:54 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@ -93,7 +93,7 @@ int onetry;
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.0b1pl17";
static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl18";
static char contrib [] = "\nPlease contribute if you find this software useful.";
static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n";