From: Evan Hunt <each@isc.org>
Date: Thu, 17 Jan 2008 17:18:28 +0000 (+0000)
Subject: Fix "dhcrelay --version" [rt17350]
X-Git-Tag: v4_1_0a1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4a896be6bcdd2dfcf58bbda73cad54602452a4d;p=thirdparty%2Fdhcp.git

Fix "dhcrelay --version" [rt17350]
---

diff --git a/RELNOTES b/RELNOTES
index 99d56e40d..16cbc510b 100644
--- 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 3df1a5860..02e289996 100644
--- 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;