Commit b12e0ca9 authored by Thomas Markwalder's avatar Thomas Markwalder

[master] Changed dhcrelay v4 command line arg from -u to -U

Changed the new uplink command line argument for v4 dhcrelay from
-u to -U to distinguish it from v6.
parent be3ee1b9
......@@ -213,7 +213,7 @@ by Eric Young (eay@cryptsoft.com).
[ISC-Bugs #39262]
- Add support for RFC 3527 to dhcrelay. A new, dhcrelay command line argument,
"-u <interface>" enables the addition of a RFC 3527 compliant link selection
"-U <interface>" enables the addition of a RFC 3527 compliant link selection
suboption to the agent option added for clients directly connected to the
relay.
[ISC-Bugs #34875]
......
......@@ -3,7 +3,7 @@
Operating system dependencies... */
/*
* Copyright (c) 2004-2005,2007-2010,2014 by Internet Systems Consortium,
* Copyright (c) 2004-2016 by Internet Systems Consortium,
* Inc. ("ISC")
* Copyright (c) 1996-2003 by Internet Software Consortium
*
......
......@@ -80,6 +80,9 @@ dhcrelay - Dynamic Host Configuration Protocol Relay Agent
.B -l
.I interface
]
.B -U
.I interface
]
.I server0
[
.I ...serverN
......@@ -217,7 +220,7 @@ packet, leaving the supplied option field intact; it may \fIreplace\fR the
existing agent option field; it may \fIforward\fR the packet unchanged; or,
it may \fIdiscard\fR it.
.TP
-u \fIifname\fR
-U \fIifname\fR
Enables the addition of a RFC 3527 compliant link selection suboption for
clients directly connected to the relay. This RFC allows a relay to
specify two different IP addresses: one for the server to use when
......@@ -242,7 +245,7 @@ This option is off by default. Note that enabling this option automatically
enables the \fB-a\fR option.
Keep in mind that using options such as \fB-m replace\fR or \fB-m discard\fR
on relays upstream from one using \fB-u\fR can pose problems. The upstream
on relays upstream from one using \fB-U\fR can pose problems. The upstream
relay will wipe out the initial agent option containing the link selection
while leaving the re-purposed giaddr value in place, causing packets to go
astray.
......
......@@ -153,7 +153,7 @@ char *progname;
" [-pf <pid-file>] [--no-pid]\n"\
" [-m append|replace|forward|discard]\n" \
" [-i interface0 [ ... -i interfaceN]\n" \
" [-u interface]\n" \
" [-U interface]\n" \
" server0 [ ... serverN]\n\n" \
" %s -6 [-d] [-q] [-I] [-c <hops>] [-p <port>]\n" \
" [-pf <pid-file>] [--no-pid]\n" \
......@@ -168,7 +168,7 @@ char *progname;
" [-pf <pid-file>] [--no-pid]\n" \
" [-m append|replace|forward|discard]\n" \
" [-i interface0 [ ... -i interfaceN]\n" \
" [-u interface]\n" \
" [-U interface]\n" \
" server0 [ ... serverN]\n\n"
#endif
......@@ -373,7 +373,7 @@ main(int argc, char **argv) {
agent_relay_mode = discard;
} else
usage("Unknown argument to -m: %s", argv[i]);
} else if (!strcmp(argv [i], "-u")) {
} else if (!strcmp(argv [i], "-U")) {
if (++i == argc)
usage(use_noarg, argv[i-1]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment