Merge branch 'master' into check_icmp_cleanuprefs/pull/1807/head

2 files changed, 9 insertions, 9 deletions

diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 7cd2675..40aa020 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_PROGRAMS = pst3
 
 EXTRA_DIST = t pst3.c
 
-BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a
+BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a $(LIB_CRYPTO)
 NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index e59e92d..c3be2ef 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -448,6 +448,14 @@ main(int argc, char **argv)
                 packets = 5;
         }
 
+        /* support "--help" and "--version" */
+        if(argc == 2) {
+                if(!strcmp(argv[1], "--help"))
+                        strcpy(argv[1], "-h");
+                if(!strcmp(argv[1], "--version"))
+                        strcpy(argv[1], "-V");
+        }
+
         /* Parse protocol arguments first */
         for(i = 1; i < argc; i++) {
                 while((arg = getopt(argc, argv, opts_str)) != EOF) {
@@ -552,14 +560,6 @@ main(int argc, char **argv)
         /* Parse extra opts if any */
         argv=np_extra_opts(&argc, argv, progname);
 
-        /* support "--help" and "--version" */
-        if(argc == 2) {
-                if(!strcmp(argv[1], "--help"))
-                        strcpy(argv[1], "-h");
-                if(!strcmp(argv[1], "--version"))
-                        strcpy(argv[1], "-V");
-        }
-
         argv = &argv[optind];
         while(*argv) {
                 add_target(*argv);