diff options
| author | Shawn Routhier <sar@isc.org> | 2016-01-12 12:33:26 -0800 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2016-01-12 12:33:26 -0800 |
| commit | eda1d0aa5a24f46de742bf7fd2989ae58d72cf78 (patch) | |
| tree | 20307dd492d284d41c02054b3904a9284a9fd6d9 /relay | |
| parent | 75ab52e12ba75ecdbe8f79c15bb614260999741c (diff) | |
| download | isc-dhcp-eda1d0aa5a24f46de742bf7fd2989ae58d72cf78.tar.gz | |
[master] Hnadle dhcpv6 being disabled better
The previous patches didn't handle dhvpv6 being disabled well.
This change moves the #ifdefs a bit to handle it.
Diffstat (limited to 'relay')
| -rw-r--r-- | relay/dhcrelay.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index 6095ebcf..e50032b8 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -183,9 +183,11 @@ char *progname; * \return Nothing */ static const char use_noarg[] = "No argument for command: %s"; +#ifdef DHCPv6 static const char use_badproto[] = "Protocol already set, %s inappropriate"; static const char use_v4command[] = "Command not used for DHCPv6: %s"; static const char use_v6command[] = "Command not used for DHCPv4: %s"; +#endif static void usage(const char *sfmt, const char *sarg) { |