Fix "dhcrelay --version" [rt17350]

diff --git a/RELNOTES b/RELNOTES
index 99d56e40d3b02c4c4b8b7e3f9b62f2fdeb836cea..16cbc510b9bc663d7dcb5aeca56ecc5ceac1e51f 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -55,6 +55,8 @@ suggested fixes to <dhcp-users@isc.org>.
 
                        Changes since 4.0.0
 
+- Fixed "--version" flag in dhcrelay
+
 - The warning logged when an address range doesn't fit in the subnets
   they were declared has been updated to be more helpful and identify the
   typo in configuration that created the spanning addresses.

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 3df1a58605f16726566c2d18f5d8ffa6caf2271e..02e289996d77fb9d10c1da7c34132aa60bb1cf66 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -194,11 +194,11 @@ main(int argc, char **argv) {
                                usage ();
                } else if (!strcmp (argv [i], "-D")) {
                        drop_agent_mismatches = 1;
-               } else if (argv [i][0] == '-') {
-                   usage ();
                } else if (!strcmp (argv [i], "--version")) {
                        log_info ("isc-dhcrelay-%s", PACKAGE_VERSION);
                        exit (0);
+               } else if (argv [i][0] == '-') {
+                       usage ();
                } else {
                        struct hostent *he;
                        struct in_addr ia, *iap = (struct in_addr *)0;