From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 27 Feb 2018 21:55:23 +0000 (-0500)
Subject: update-leap: check for -h/--help early.  HStenn
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0017cfe3e93388bac2c9a3fa60e50a4828ae26c5;p=thirdparty%2Fntp.git

update-leap: check for -h/--help early.  HStenn

bk: 5a95d3cbl89nGuRPtC0JNV24ih-Dlw
---

diff --git a/ChangeLog b/ChangeLog
index 46526e7ff..b4ee4247a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,6 +98,7 @@
 * Provide dump_restricts() for debugging.  HStenn.
 * Use consistent 4th arg type for [gs]etsockopt.  JPerlinger.
 * Some tests might need LIBM.  HStenn.
+* update-leap: Allow -h/--help early.  HStenn.
 
 ---
 (4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/scripts/update-leap/update-leap.in b/scripts/update-leap/update-leap.in
index ff414cf7c..abf1134c1 100755
--- a/scripts/update-leap/update-leap.in
+++ b/scripts/update-leap/update-leap.in
@@ -81,7 +81,7 @@ GetOptions(\%opt,
 	'e:60',
 	'F',
 	'f=s',
-	'h',
+	'h|help',
 	'i:10',
 	'L=s',
 	'l=s',
@@ -140,18 +140,18 @@ $SIG{QUIT} = \&signal_catcher;
 # Take some security precautions
 close STDIN;
 
-if ($< != $RUN_UID) {
-    log_fatal(LOG_ERR, 'User ' . getpwuid($<) . " (UID $<) tried to run $PROG");
-}
-
-chdir $RUN_DIR || log_fatal("Failed to change dir to $RUN_DIR");
-
 # Show help
 if (defined $opt{h}) {
     show_help();
     exit 0;
 }
 
+if ($< != $RUN_UID) {
+    log_fatal(LOG_ERR, 'User ' . getpwuid($<) . " (UID $<) tried to run $PROG");
+}
+
+chdir $RUN_DIR || log_fatal("Failed to change dir to $RUN_DIR");
+
 # Parse ntp.conf for path to leapfile if not set by user
 if (! $LEAPFILE) {