diff options
| author | obrien <obrien@FreeBSD.org> | 1999-03-22 01:29:39 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-03-22 01:29:39 +0000 |
| commit | 7395a30f200b2d1dc9bc882eac6bf20d1e984548 (patch) | |
| tree | e4a694c4defc69477a3f18c979a3e4b8afc3906e /contrib | |
| parent | c02dac0736fae32191170618777e61a6482ab58d (diff) | |
| download | FreeBSD-src-7395a30f200b2d1dc9bc882eac6bf20d1e984548.zip FreeBSD-src-7395a30f200b2d1dc9bc882eac6bf20d1e984548.tar.gz | |
fix conflicts.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/isc-dhcp/client/dhclient.8 | 12 | ||||
| -rw-r--r-- | contrib/isc-dhcp/client/dhclient.c | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/contrib/isc-dhcp/client/dhclient.8 b/contrib/isc-dhcp/client/dhclient.8 index 1ac1e10..f064822 100644 --- a/contrib/isc-dhcp/client/dhclient.8 +++ b/contrib/isc-dhcp/client/dhclient.8 @@ -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. diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c index 4c5e7d2..01c075f 100644 --- a/contrib/isc-dhcp/client/dhclient.c +++ b/contrib/isc-dhcp/client/dhclient.c @@ -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"; |
