diff options
57 files changed, 121 insertions, 114 deletions
@@ -19,6 +19,8 @@ This file documents the major additions and syntax changes between releases. | |||
19 | The format of the performance data emitted by check_mrtgtraf has been | 19 | The format of the performance data emitted by check_mrtgtraf has been |
20 | changed to comply with the development guidelines | 20 | changed to comply with the development guidelines |
21 | check_ssh not returns CRITICAL for protocal/version errors | 21 | check_ssh not returns CRITICAL for protocal/version errors |
22 | If a plugin is invoked with -h/--help or -V/--version, the exit status | ||
23 | is now UNKNOWN | ||
22 | 24 | ||
23 | 2.1.1 2nd December 2014 | 25 | 2.1.1 2nd December 2014 |
24 | FIXES | 26 | FIXES |
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml index d934028..228d3fa 100644 --- a/doc/developer-guidelines.sgml +++ b/doc/developer-guidelines.sgml | |||
@@ -194,13 +194,15 @@ | |||
194 | <row> | 194 | <row> |
195 | <entry align="center"><para>3</para></entry> | 195 | <entry align="center"><para>3</para></entry> |
196 | <entry valign="middle"><para>Unknown</para></entry> | 196 | <entry valign="middle"><para>Unknown</para></entry> |
197 | <entry><para>Invalid command line arguments were supplied to the | 197 | <entry><para>Invalid command line arguments were supplied to the |
198 | plugin or low-level failures internal to the plugin (such as unable to fork, | 198 | plugin or low-level failures internal to the plugin (such as unable to fork, |
199 | or open a tcp socket) that prevent it from performing the specified | 199 | or open a tcp socket) that prevent it from performing the specified |
200 | operation. Higher-level errors (such as name resolution errors, | 200 | operation. Higher-level errors (such as name resolution errors, |
201 | socket timeouts, etc) are outside of the control of plugins and should | 201 | socket timeouts, etc) are outside of the control of plugins and should |
202 | generally NOT be reported as UNKNOWN states. | 202 | generally NOT be reported as UNKNOWN states. |
203 | </para></entry> | 203 | </para> |
204 | <para>The --help or --version output should also result in Unknown state.</para> | ||
205 | </entry> | ||
204 | </row> | 206 | </row> |
205 | </tbody> | 207 | </tbody> |
206 | </tgroup> | 208 | </tgroup> |
@@ -610,6 +612,9 @@ | |||
610 | <para>The option -v or --verbose should be present in all plugins. | 612 | <para>The option -v or --verbose should be present in all plugins. |
611 | The user should be allowed to specify -v multiple times to increase | 613 | The user should be allowed to specify -v multiple times to increase |
612 | the verbosity level, as described in <xref linkend="verboselevels">.</para> | 614 | the verbosity level, as described in <xref linkend="verboselevels">.</para> |
615 | |||
616 | The exit code for version information or help should be UNKNOWN | ||
617 | (3).</para> | ||
613 | </section> | 618 | </section> |
614 | 619 | ||
615 | <section> | 620 | <section> |
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index b874c55..3723e61 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c | |||
@@ -1163,11 +1163,11 @@ int call_getopt(int argc, char **argv){ | |||
1163 | 1163 | ||
1164 | case 'V': /* version */ | 1164 | case 'V': /* version */ |
1165 | print_revision(progname, NP_VERSION); | 1165 | print_revision(progname, NP_VERSION); |
1166 | exit(STATE_OK); | 1166 | exit(STATE_UNKNOWN); |
1167 | 1167 | ||
1168 | case 'h': /* help */ | 1168 | case 'h': /* help */ |
1169 | print_help(); | 1169 | print_help(); |
1170 | exit(STATE_OK); | 1170 | exit(STATE_UNKNOWN); |
1171 | 1171 | ||
1172 | case 'v': /* verbose */ | 1172 | case 'v': /* verbose */ |
1173 | verbose=1; | 1173 | verbose=1; |
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c index f420837..9ed12ba 100644 --- a/plugins-root/check_icmp.c +++ b/plugins-root/check_icmp.c | |||
@@ -526,10 +526,10 @@ main(int argc, char **argv) | |||
526 | break; | 526 | break; |
527 | case 'V': /* version */ | 527 | case 'V': /* version */ |
528 | print_revision (progname, NP_VERSION); | 528 | print_revision (progname, NP_VERSION); |
529 | exit (STATE_OK); | 529 | exit (STATE_UNKNOWN); |
530 | case 'h': /* help */ | 530 | case 'h': /* help */ |
531 | print_help (); | 531 | print_help (); |
532 | exit (STATE_OK); | 532 | exit (STATE_UNKNOWN); |
533 | } | 533 | } |
534 | } | 534 | } |
535 | } | 535 | } |
diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl index 12a60ee..05b9920 100755 --- a/plugins-scripts/check_breeze.pl +++ b/plugins-scripts/check_breeze.pl | |||
@@ -28,10 +28,10 @@ GetOptions | |||
28 | 28 | ||
29 | if ($opt_V) { | 29 | if ($opt_V) { |
30 | print_revision($PROGNAME,'@NP_VERSION@'); | 30 | print_revision($PROGNAME,'@NP_VERSION@'); |
31 | exit $ERRORS{'OK'}; | 31 | exit $ERRORS{'UNKNOWN'}; |
32 | } | 32 | } |
33 | 33 | ||
34 | if ($opt_h) {print_help(); exit $ERRORS{'OK'};} | 34 | if ($opt_h) {print_help(); exit $ERRORS{'UNKNOWN'};} |
35 | 35 | ||
36 | ($opt_H) || usage("Host name/address not specified\n"); | 36 | ($opt_H) || usage("Host name/address not specified\n"); |
37 | my $host = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/); | 37 | my $host = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/); |
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl index 99948a4..9899226 100755 --- a/plugins-scripts/check_disk_smb.pl +++ b/plugins-scripts/check_disk_smb.pl | |||
@@ -54,10 +54,10 @@ GetOptions | |||
54 | 54 | ||
55 | if ($opt_V) { | 55 | if ($opt_V) { |
56 | print_revision($PROGNAME,'@NP_VERSION@'); #' | 56 | print_revision($PROGNAME,'@NP_VERSION@'); #' |
57 | exit $ERRORS{'OK'}; | 57 | exit $ERRORS{'UNKNOWN'}; |
58 | } | 58 | } |
59 | 59 | ||
60 | if ($opt_h) {print_help(); exit $ERRORS{'OK'};} | 60 | if ($opt_h) {print_help(); exit $ERRORS{'UNKNOWN'};} |
61 | 61 | ||
62 | my $smbclient = $utils::PATH_TO_SMBCLIENT; | 62 | my $smbclient = $utils::PATH_TO_SMBCLIENT; |
63 | $smbclient || usage("check requires smbclient, smbclient not set\n"); | 63 | $smbclient || usage("check requires smbclient, smbclient not set\n"); |
diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl index 15330f7..56b8e97 100755 --- a/plugins-scripts/check_file_age.pl +++ b/plugins-scripts/check_file_age.pl | |||
@@ -60,12 +60,12 @@ GetOptions( | |||
60 | 60 | ||
61 | if ($opt_V) { | 61 | if ($opt_V) { |
62 | print_revision($PROGNAME, '@NP_VERSION@'); | 62 | print_revision($PROGNAME, '@NP_VERSION@'); |
63 | exit $ERRORS{'OK'}; | 63 | exit $ERRORS{'UNKNOWN'}; |
64 | } | 64 | } |
65 | 65 | ||
66 | if ($opt_h) { | 66 | if ($opt_h) { |
67 | print_help(); | 67 | print_help(); |
68 | exit $ERRORS{'OK'}; | 68 | exit $ERRORS{'UNKNOWN'}; |
69 | } | 69 | } |
70 | 70 | ||
71 | $opt_f = shift unless ($opt_f); | 71 | $opt_f = shift unless ($opt_f); |
diff --git a/plugins-scripts/check_flexlm.pl b/plugins-scripts/check_flexlm.pl index 49d674d..e3fe296 100755 --- a/plugins-scripts/check_flexlm.pl +++ b/plugins-scripts/check_flexlm.pl | |||
@@ -58,7 +58,7 @@ GetOptions | |||
58 | 58 | ||
59 | if ($opt_V) { | 59 | if ($opt_V) { |
60 | print_revision($PROGNAME,'@NP_VERSION@'); | 60 | print_revision($PROGNAME,'@NP_VERSION@'); |
61 | exit $ERRORS{'OK'}; | 61 | exit $ERRORS{'UNKNOWN'}; |
62 | } | 62 | } |
63 | 63 | ||
64 | unless (defined $opt_t) { | 64 | unless (defined $opt_t) { |
@@ -66,7 +66,7 @@ unless (defined $opt_t) { | |||
66 | } | 66 | } |
67 | 67 | ||
68 | 68 | ||
69 | if ($opt_h) {print_help(); exit $ERRORS{'OK'};} | 69 | if ($opt_h) {print_help(); exit $ERRORS{'UNKNOWN'};} |
70 | 70 | ||
71 | unless (defined $opt_F) { | 71 | unless (defined $opt_F) { |
72 | print "Missing license.dat file\n"; | 72 | print "Missing license.dat file\n"; |
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl index 1a7fbba..3eed4bc 100755 --- a/plugins-scripts/check_ifoperstatus.pl +++ b/plugins-scripts/check_ifoperstatus.pl | |||
@@ -367,17 +367,17 @@ sub process_arguments() { | |||
367 | 367 | ||
368 | if ($status == 0){ | 368 | if ($status == 0){ |
369 | print_help(); | 369 | print_help(); |
370 | exit $ERRORS{'OK'}; | 370 | exit $ERRORS{'UNKNOWN'}; |
371 | } | 371 | } |
372 | 372 | ||
373 | if ($opt_V) { | 373 | if ($opt_V) { |
374 | print_revision($PROGNAME,'@NP_VERSION@'); | 374 | print_revision($PROGNAME,'@NP_VERSION@'); |
375 | exit $ERRORS{'OK'}; | 375 | exit $ERRORS{'UNKNOWN'}; |
376 | } | 376 | } |
377 | 377 | ||
378 | if ($opt_h) { | 378 | if ($opt_h) { |
379 | print_help(); | 379 | print_help(); |
380 | exit $ERRORS{'OK'}; | 380 | exit $ERRORS{'UNKNOWN'}; |
381 | } | 381 | } |
382 | 382 | ||
383 | if (! utils::is_hostname($hostname)){ | 383 | if (! utils::is_hostname($hostname)){ |
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl index 2c76d0c..9f2f7c3 100755 --- a/plugins-scripts/check_ifstatus.pl +++ b/plugins-scripts/check_ifstatus.pl | |||
@@ -119,7 +119,7 @@ $status = process_arguments(); | |||
119 | if ($status != 0) | 119 | if ($status != 0) |
120 | { | 120 | { |
121 | print_help() ; | 121 | print_help() ; |
122 | exit $ERRORS{'OK'}; | 122 | exit $ERRORS{'UNKNOWN'}; |
123 | } | 123 | } |
124 | 124 | ||
125 | 125 | ||
@@ -313,17 +313,17 @@ sub process_arguments() { | |||
313 | 313 | ||
314 | if ($status == 0){ | 314 | if ($status == 0){ |
315 | print_help(); | 315 | print_help(); |
316 | exit $ERRORS{'OK'}; | 316 | exit $ERRORS{'UNKNOWN'}; |
317 | } | 317 | } |
318 | 318 | ||
319 | if ($opt_V) { | 319 | if ($opt_V) { |
320 | print_revision($PROGNAME,'@NP_VERSION@'); | 320 | print_revision($PROGNAME,'@NP_VERSION@'); |
321 | exit $ERRORS{'OK'}; | 321 | exit $ERRORS{'UNKNOWN'}; |
322 | } | 322 | } |
323 | 323 | ||
324 | if ($opt_h) { | 324 | if ($opt_h) { |
325 | print_help(); | 325 | print_help(); |
326 | exit $ERRORS{'OK'}; | 326 | exit $ERRORS{'UNKNOWN'}; |
327 | } | 327 | } |
328 | 328 | ||
329 | unless (defined $timeout) { | 329 | unless (defined $timeout) { |
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl index afedfb9..22d21c2 100755 --- a/plugins-scripts/check_ircd.pl +++ b/plugins-scripts/check_ircd.pl | |||
@@ -181,10 +181,10 @@ MAIN: | |||
181 | 181 | ||
182 | if ($opt_V) { | 182 | if ($opt_V) { |
183 | print_revision($PROGNAME,'@NP_VERSION@'); | 183 | print_revision($PROGNAME,'@NP_VERSION@'); |
184 | exit $ERRORS{'OK'}; | 184 | exit $ERRORS{'UNKNOWN'}; |
185 | } | 185 | } |
186 | 186 | ||
187 | if ($opt_h) {print_help(); exit $ERRORS{'OK'};} | 187 | if ($opt_h) {print_help(); exit $ERRORS{'UNKNOWN'};} |
188 | 188 | ||
189 | ($opt_H) || ($opt_H = shift @ARGV) || usage("Host name/address not specified\n"); | 189 | ($opt_H) || ($opt_H = shift @ARGV) || usage("Host name/address not specified\n"); |
190 | my $remotehost = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/); | 190 | my $remotehost = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/); |
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl index 3086e94..32f498d 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl | |||
@@ -573,12 +573,12 @@ sub process_arguments(){ | |||
573 | 573 | ||
574 | if ($opt_V) { | 574 | if ($opt_V) { |
575 | print_revision($PROGNAME,'@NP_VERSION@'); | 575 | print_revision($PROGNAME,'@NP_VERSION@'); |
576 | exit $ERRORS{'OK'}; | 576 | exit $ERRORS{'UNKNOWN'}; |
577 | } | 577 | } |
578 | 578 | ||
579 | if ($opt_h) { | 579 | if ($opt_h) { |
580 | print_help(); | 580 | print_help(); |
581 | exit $ERRORS{'OK'}; | 581 | exit $ERRORS{'UNKNOWN'}; |
582 | } | 582 | } |
583 | 583 | ||
584 | if (defined $opt_v ){ | 584 | if (defined $opt_v ){ |
diff --git a/plugins-scripts/check_mssql.pl b/plugins-scripts/check_mssql.pl index a436a8f..fb3952d 100755 --- a/plugins-scripts/check_mssql.pl +++ b/plugins-scripts/check_mssql.pl | |||
@@ -130,7 +130,7 @@ sub process_arguments { | |||
130 | 130 | ||
131 | if (defined $opt_V) { | 131 | if (defined $opt_V) { |
132 | print_revision($PROGNAME,'@NP_VERSION@'); | 132 | print_revision($PROGNAME,'@NP_VERSION@'); |
133 | exit $ERRORS{'OK'}; | 133 | exit $ERRORS{'UNKNOWN'}; |
134 | } | 134 | } |
135 | 135 | ||
136 | syntax("Help:") if ($help); | 136 | syntax("Help:") if ($help); |
diff --git a/plugins-scripts/check_netdns.pl b/plugins-scripts/check_netdns.pl index 8c63108..38538e5 100755 --- a/plugins-scripts/check_netdns.pl +++ b/plugins-scripts/check_netdns.pl | |||
@@ -48,10 +48,10 @@ GetOptions("V" => $opt_V, "version" => $opt_V, | |||
48 | "H=s" => $opt_H, "hostname=s" => $opt_H); | 48 | "H=s" => $opt_H, "hostname=s" => $opt_H); |
49 | 49 | ||
50 | # -h means display verbose help screen | 50 | # -h means display verbose help screen |
51 | if($opt_h){ print_help(); exit 0; } | 51 | if($opt_h){ print_help(); exit 3; } |
52 | 52 | ||
53 | # -V means display version number | 53 | # -V means display version number |
54 | if ($opt_V) { print_version(); exit 0; } | 54 | if ($opt_V) { print_version(); exit 3; } |
55 | 55 | ||
56 | # -H means host name | 56 | # -H means host name |
57 | $opt_H = shift unless ($opt_H); | 57 | $opt_H = shift unless ($opt_H); |
@@ -73,7 +73,7 @@ if ($opt_s) { | |||
73 | $server = $1; | 73 | $server = $1; |
74 | } else { | 74 | } else { |
75 | print "$opt_s is not a valid host name"; | 75 | print "$opt_s is not a valid host name"; |
76 | exit -1; | 76 | exit 3; |
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
diff --git a/plugins-scripts/check_ntp.pl b/plugins-scripts/check_ntp.pl index dd2cd6d..f400001 100755 --- a/plugins-scripts/check_ntp.pl +++ b/plugins-scripts/check_ntp.pl | |||
@@ -98,12 +98,12 @@ GetOptions | |||
98 | 98 | ||
99 | if ($opt_V) { | 99 | if ($opt_V) { |
100 | print_revision($PROGNAME,'@NP_VERSION@'); | 100 | print_revision($PROGNAME,'@NP_VERSION@'); |
101 | exit $ERRORS{'OK'}; | 101 | exit $ERRORS{'UNKNOWN'}; |
102 | } | 102 | } |
103 | 103 | ||
104 | if ($opt_h) { | 104 | if ($opt_h) { |
105 | print_help(); | 105 | print_help(); |
106 | exit $ERRORS{'OK'}; | 106 | exit $ERRORS{'UNKNOWN'}; |
107 | } | 107 | } |
108 | 108 | ||
109 | # jitter test params specified | 109 | # jitter test params specified |
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl index cbdeceb..47d6e49 100755 --- a/plugins-scripts/check_rpc.pl +++ b/plugins-scripts/check_rpc.pl | |||
@@ -63,12 +63,12 @@ GetOptions( | |||
63 | ); | 63 | ); |
64 | 64 | ||
65 | # -h means display verbose help screen | 65 | # -h means display verbose help screen |
66 | if ($opt_h) { print_help(); exit $ERRORS{'OK'}; } | 66 | if ($opt_h) { print_help(); exit $ERRORS{'UNKNOWN'}; } |
67 | 67 | ||
68 | # -V means display version number | 68 | # -V means display version number |
69 | if ($opt_V) { | 69 | if ($opt_V) { |
70 | print_revision($PROGNAME,'@NP_VERSION@'); | 70 | print_revision($PROGNAME,'@NP_VERSION@'); |
71 | exit $ERRORS{'OK'}; | 71 | exit $ERRORS{'UNKNOWN'}; |
72 | } | 72 | } |
73 | 73 | ||
74 | # Hash containing all RPC program names and numbers | 74 | # Hash containing all RPC program names and numbers |
diff --git a/plugins-scripts/check_wave.pl b/plugins-scripts/check_wave.pl index 979416e..41e15f5 100755 --- a/plugins-scripts/check_wave.pl +++ b/plugins-scripts/check_wave.pl | |||
@@ -31,12 +31,12 @@ GetOptions | |||
31 | 31 | ||
32 | if ($opt_V) { | 32 | if ($opt_V) { |
33 | print_revision($PROGNAME,'@NP_VERSION@'); #' | 33 | print_revision($PROGNAME,'@NP_VERSION@'); #' |
34 | exit $ERRORS{'OK'}; | 34 | exit $ERRORS{'UNKNOWN'}; |
35 | } | 35 | } |
36 | 36 | ||
37 | if ($opt_h) { | 37 | if ($opt_h) { |
38 | print_help(); | 38 | print_help(); |
39 | exit $ERRORS{'OK'}; | 39 | exit $ERRORS{'UNKNOWN'}; |
40 | } | 40 | } |
41 | 41 | ||
42 | $opt_H = shift unless ($opt_H); | 42 | $opt_H = shift unless ($opt_H); |
diff --git a/plugins-scripts/t/check_rpc.t b/plugins-scripts/t/check_rpc.t index be8ae2f..c58f7bf 100644 --- a/plugins-scripts/t/check_rpc.t +++ b/plugins-scripts/t/check_rpc.t | |||
@@ -15,7 +15,7 @@ my $successOutput = '/^check_rpc/'; | |||
15 | 15 | ||
16 | my $t; | 16 | my $t; |
17 | 17 | ||
18 | $t += checkCmd( "./check_rpc -V", 0, $successOutput ); | 18 | $t += checkCmd( "./check_rpc -V", 3, $successOutput ); |
19 | 19 | ||
20 | exit(0) if defined($Test::Harness::VERSION); | 20 | exit(0) if defined($Test::Harness::VERSION); |
21 | exit($tests - $t); | 21 | exit($tests - $t); |
diff --git a/plugins/check_apt.c b/plugins/check_apt.c index 8747f90..a639a41 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c | |||
@@ -160,10 +160,10 @@ int process_arguments (int argc, char **argv) { | |||
160 | switch(c) { | 160 | switch(c) { |
161 | case 'h': | 161 | case 'h': |
162 | print_help(); | 162 | print_help(); |
163 | exit(STATE_OK); | 163 | exit(STATE_UNKNOWN); |
164 | case 'V': | 164 | case 'V': |
165 | print_revision(progname, NP_VERSION); | 165 | print_revision(progname, NP_VERSION); |
166 | exit(STATE_OK); | 166 | exit(STATE_UNKNOWN); |
167 | case 'v': | 167 | case 'v': |
168 | verbose++; | 168 | verbose++; |
169 | break; | 169 | break; |
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index a877f88..04bce38 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c | |||
@@ -209,10 +209,10 @@ process_arguments (int argc, char **argv) | |||
209 | switch (c) { | 209 | switch (c) { |
210 | case 'V': /* version */ | 210 | case 'V': /* version */ |
211 | print_revision (progname, NP_VERSION); | 211 | print_revision (progname, NP_VERSION); |
212 | exit (STATE_OK); | 212 | exit (STATE_UNKNOWN); |
213 | case 'h': /* help */ | 213 | case 'h': /* help */ |
214 | print_help (); | 214 | print_help (); |
215 | exit (STATE_OK); | 215 | exit (STATE_UNKNOWN); |
216 | case 'v': /* help */ | 216 | case 'v': /* help */ |
217 | verbose = TRUE; | 217 | verbose = TRUE; |
218 | break; | 218 | break; |
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c index cf699e1..b86e501 100644 --- a/plugins/check_cluster.c +++ b/plugins/check_cluster.c | |||
@@ -200,7 +200,7 @@ int process_arguments(int argc, char **argv){ | |||
200 | 200 | ||
201 | case 'V': /* version */ | 201 | case 'V': /* version */ |
202 | print_revision (progname, NP_VERSION); | 202 | print_revision (progname, NP_VERSION); |
203 | exit (STATE_OK); | 203 | exit (STATE_UNKNOWN); |
204 | break; | 204 | break; |
205 | 205 | ||
206 | case 'H': /* help */ | 206 | case 'H': /* help */ |
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c index a3d033f..826eb8d 100644 --- a/plugins/check_dbi.c +++ b/plugins/check_dbi.c | |||
@@ -368,10 +368,10 @@ process_arguments (int argc, char **argv) | |||
368 | usage5 (); | 368 | usage5 (); |
369 | case 'h': /* help */ | 369 | case 'h': /* help */ |
370 | print_help (); | 370 | print_help (); |
371 | exit (STATE_OK); | 371 | exit (STATE_UNKNOWN); |
372 | case 'V': /* version */ | 372 | case 'V': /* version */ |
373 | print_revision (progname, NP_VERSION); | 373 | print_revision (progname, NP_VERSION); |
374 | exit (STATE_OK); | 374 | exit (STATE_UNKNOWN); |
375 | 375 | ||
376 | case 'c': /* critical range */ | 376 | case 'c': /* critical range */ |
377 | critical_range = optarg; | 377 | critical_range = optarg; |
diff --git a/plugins/check_dig.c b/plugins/check_dig.c index d899b11..db4b20e 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c | |||
@@ -223,10 +223,10 @@ process_arguments (int argc, char **argv) | |||
223 | switch (c) { | 223 | switch (c) { |
224 | case 'h': /* help */ | 224 | case 'h': /* help */ |
225 | print_help (); | 225 | print_help (); |
226 | exit (STATE_OK); | 226 | exit (STATE_UNKNOWN); |
227 | case 'V': /* version */ | 227 | case 'V': /* version */ |
228 | print_revision (progname, NP_VERSION); | 228 | print_revision (progname, NP_VERSION); |
229 | exit (STATE_OK); | 229 | exit (STATE_UNKNOWN); |
230 | case 'H': /* hostname */ | 230 | case 'H': /* hostname */ |
231 | host_or_die(optarg); | 231 | host_or_die(optarg); |
232 | dns_server = optarg; | 232 | dns_server = optarg; |
diff --git a/plugins/check_disk.c b/plugins/check_disk.c index eb573f5..9693bad 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c | |||
@@ -766,10 +766,10 @@ process_arguments (int argc, char **argv) | |||
766 | break; | 766 | break; |
767 | case 'V': /* version */ | 767 | case 'V': /* version */ |
768 | print_revision (progname, NP_VERSION); | 768 | print_revision (progname, NP_VERSION); |
769 | exit (STATE_OK); | 769 | exit (STATE_UNKNOWN); |
770 | case 'h': /* help */ | 770 | case 'h': /* help */ |
771 | print_help (); | 771 | print_help (); |
772 | exit (STATE_OK); | 772 | exit (STATE_UNKNOWN); |
773 | case '?': /* help */ | 773 | case '?': /* help */ |
774 | usage (_("Unknown argument")); | 774 | usage (_("Unknown argument")); |
775 | } | 775 | } |
diff --git a/plugins/check_dns.c b/plugins/check_dns.c index 2212122..d6bd2c0 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c | |||
@@ -395,10 +395,10 @@ process_arguments (int argc, char **argv) | |||
395 | switch (c) { | 395 | switch (c) { |
396 | case 'h': /* help */ | 396 | case 'h': /* help */ |
397 | print_help (); | 397 | print_help (); |
398 | exit (STATE_OK); | 398 | exit (STATE_UNKNOWN); |
399 | case 'V': /* version */ | 399 | case 'V': /* version */ |
400 | print_revision (progname, NP_VERSION); | 400 | print_revision (progname, NP_VERSION); |
401 | exit (STATE_OK); | 401 | exit (STATE_UNKNOWN); |
402 | case 'v': /* version */ | 402 | case 'v': /* version */ |
403 | verbose = TRUE; | 403 | verbose = TRUE; |
404 | break; | 404 | break; |
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c index 3ed6871..212a134 100644 --- a/plugins/check_dummy.c +++ b/plugins/check_dummy.c | |||
@@ -52,11 +52,11 @@ main (int argc, char **argv) | |||
52 | usage4 (_("Could not parse arguments")); | 52 | usage4 (_("Could not parse arguments")); |
53 | else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) { | 53 | else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) { |
54 | print_revision (progname, NP_VERSION); | 54 | print_revision (progname, NP_VERSION); |
55 | exit (STATE_OK); | 55 | exit (STATE_UNKNOWN); |
56 | } | 56 | } |
57 | else if (strcmp (argv[1], "-h") == 0 || strcmp (argv[1], "--help") == 0) { | 57 | else if (strcmp (argv[1], "-h") == 0 || strcmp (argv[1], "--help") == 0) { |
58 | print_help (); | 58 | print_help (); |
59 | exit (STATE_OK); | 59 | exit (STATE_UNKNOWN); |
60 | } | 60 | } |
61 | else if (!is_integer (argv[1])) | 61 | else if (!is_integer (argv[1])) |
62 | usage4 (_("Arguments to check_dummy must be an integer")); | 62 | usage4 (_("Arguments to check_dummy must be an integer")); |
diff --git a/plugins/check_fping.c b/plugins/check_fping.c index 274dd75..da1ce1a 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c | |||
@@ -314,10 +314,10 @@ process_arguments (int argc, char **argv) | |||
314 | usage5 (); | 314 | usage5 (); |
315 | case 'h': /* help */ | 315 | case 'h': /* help */ |
316 | print_help (); | 316 | print_help (); |
317 | exit (STATE_OK); | 317 | exit (STATE_UNKNOWN); |
318 | case 'V': /* version */ | 318 | case 'V': /* version */ |
319 | print_revision (progname, NP_VERSION); | 319 | print_revision (progname, NP_VERSION); |
320 | exit (STATE_OK); | 320 | exit (STATE_UNKNOWN); |
321 | case 'v': /* verbose mode */ | 321 | case 'v': /* verbose mode */ |
322 | verbose = TRUE; | 322 | verbose = TRUE; |
323 | break; | 323 | break; |
diff --git a/plugins/check_game.c b/plugins/check_game.c index 29e59e2..709dae1 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c | |||
@@ -196,10 +196,10 @@ process_arguments (int argc, char **argv) | |||
196 | switch (c) { | 196 | switch (c) { |
197 | case 'h': /* help */ | 197 | case 'h': /* help */ |
198 | print_help (); | 198 | print_help (); |
199 | exit (STATE_OK); | 199 | exit (STATE_UNKNOWN); |
200 | case 'V': /* version */ | 200 | case 'V': /* version */ |
201 | print_revision (progname, NP_VERSION); | 201 | print_revision (progname, NP_VERSION); |
202 | exit (STATE_OK); | 202 | exit (STATE_UNKNOWN); |
203 | case 'v': /* version */ | 203 | case 'v': /* version */ |
204 | verbose = TRUE; | 204 | verbose = TRUE; |
205 | break; | 205 | break; |
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c index 5fe0698..f159f5a 100644 --- a/plugins/check_hpjd.c +++ b/plugins/check_hpjd.c | |||
@@ -350,10 +350,10 @@ process_arguments (int argc, char **argv) | |||
350 | break; | 350 | break; |
351 | case 'V': /* version */ | 351 | case 'V': /* version */ |
352 | print_revision (progname, NP_VERSION); | 352 | print_revision (progname, NP_VERSION); |
353 | exit (STATE_OK); | 353 | exit (STATE_UNKNOWN); |
354 | case 'h': /* help */ | 354 | case 'h': /* help */ |
355 | print_help (); | 355 | print_help (); |
356 | exit (STATE_OK); | 356 | exit (STATE_UNKNOWN); |
357 | case '?': /* help */ | 357 | case '?': /* help */ |
358 | usage5 (); | 358 | usage5 (); |
359 | } | 359 | } |
diff --git a/plugins/check_http.c b/plugins/check_http.c index 9dc2765..68b470c 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
@@ -267,11 +267,11 @@ process_arguments (int argc, char **argv) | |||
267 | break; | 267 | break; |
268 | case 'h': /* help */ | 268 | case 'h': /* help */ |
269 | print_help (); | 269 | print_help (); |
270 | exit (STATE_OK); | 270 | exit (STATE_UNKNOWN); |
271 | break; | 271 | break; |
272 | case 'V': /* version */ | 272 | case 'V': /* version */ |
273 | print_revision (progname, NP_VERSION); | 273 | print_revision (progname, NP_VERSION); |
274 | exit (STATE_OK); | 274 | exit (STATE_UNKNOWN); |
275 | break; | 275 | break; |
276 | case 't': /* timeout period */ | 276 | case 't': /* timeout period */ |
277 | if (!is_intnonneg (optarg)) | 277 | if (!is_intnonneg (optarg)) |
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c index 47605e9..8d540ca 100644 --- a/plugins/check_ide_smart.c +++ b/plugins/check_ide_smart.c | |||
@@ -234,10 +234,10 @@ main (int argc, char *argv[]) | |||
234 | break; | 234 | break; |
235 | case 'h': | 235 | case 'h': |
236 | print_help (); | 236 | print_help (); |
237 | return STATE_OK; | 237 | return STATE_UNKNOWN; |
238 | case 'V': | 238 | case 'V': |
239 | print_revision (progname, NP_VERSION); | 239 | print_revision (progname, NP_VERSION); |
240 | return STATE_OK; | 240 | return STATE_UNKNOWN; |
241 | default: | 241 | default: |
242 | usage5 (); | 242 | usage5 (); |
243 | } | 243 | } |
@@ -249,7 +249,7 @@ main (int argc, char *argv[]) | |||
249 | 249 | ||
250 | if (!device) { | 250 | if (!device) { |
251 | print_help (); | 251 | print_help (); |
252 | return STATE_OK; | 252 | return STATE_UNKNOWN; |
253 | } | 253 | } |
254 | 254 | ||
255 | fd = open (device, OPEN_MODE); | 255 | fd = open (device, OPEN_MODE); |
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index cfc8222..e70d6a5 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c | |||
@@ -325,10 +325,10 @@ process_arguments (int argc, char **argv) | |||
325 | switch (c) { | 325 | switch (c) { |
326 | case 'h': /* help */ | 326 | case 'h': /* help */ |
327 | print_help (); | 327 | print_help (); |
328 | exit (STATE_OK); | 328 | exit (STATE_UNKNOWN); |
329 | case 'V': /* version */ | 329 | case 'V': /* version */ |
330 | print_revision (progname, NP_VERSION); | 330 | print_revision (progname, NP_VERSION); |
331 | exit (STATE_OK); | 331 | exit (STATE_UNKNOWN); |
332 | case 't': /* timeout period */ | 332 | case 't': /* timeout period */ |
333 | if (!is_intnonneg (optarg)) | 333 | if (!is_intnonneg (optarg)) |
334 | usage2 (_("Timeout interval must be a positive integer"), optarg); | 334 | usage2 (_("Timeout interval must be a positive integer"), optarg); |
diff --git a/plugins/check_load.c b/plugins/check_load.c index cde63e5..a96435f 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c | |||
@@ -251,10 +251,10 @@ process_arguments (int argc, char **argv) | |||
251 | break; | 251 | break; |
252 | case 'V': /* version */ | 252 | case 'V': /* version */ |
253 | print_revision (progname, NP_VERSION); | 253 | print_revision (progname, NP_VERSION); |
254 | exit (STATE_OK); | 254 | exit (STATE_UNKNOWN); |
255 | case 'h': /* help */ | 255 | case 'h': /* help */ |
256 | print_help (); | 256 | print_help (); |
257 | exit (STATE_OK); | 257 | exit (STATE_UNKNOWN); |
258 | case '?': /* help */ | 258 | case '?': /* help */ |
259 | usage5 (); | 259 | usage5 (); |
260 | } | 260 | } |
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c index cf3fe04..1fda549 100644 --- a/plugins/check_mrtg.c +++ b/plugins/check_mrtg.c | |||
@@ -234,10 +234,10 @@ process_arguments (int argc, char **argv) | |||
234 | break; | 234 | break; |
235 | case 'V': /* version */ | 235 | case 'V': /* version */ |
236 | print_revision (progname, NP_VERSION); | 236 | print_revision (progname, NP_VERSION); |
237 | exit (STATE_OK); | 237 | exit (STATE_UNKNOWN); |
238 | case 'h': /* help */ | 238 | case 'h': /* help */ |
239 | print_help (); | 239 | print_help (); |
240 | exit (STATE_OK); | 240 | exit (STATE_UNKNOWN); |
241 | case '?': /* help */ | 241 | case '?': /* help */ |
242 | usage5 (); | 242 | usage5 (); |
243 | } | 243 | } |
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c index 3b038cf..eb66f62 100644 --- a/plugins/check_mrtgtraf.c +++ b/plugins/check_mrtgtraf.c | |||
@@ -270,10 +270,10 @@ process_arguments (int argc, char **argv) | |||
270 | break; | 270 | break; |
271 | case 'V': /* version */ | 271 | case 'V': /* version */ |
272 | print_revision (progname, NP_VERSION); | 272 | print_revision (progname, NP_VERSION); |
273 | exit (STATE_OK); | 273 | exit (STATE_UNKNOWN); |
274 | case 'h': /* help */ | 274 | case 'h': /* help */ |
275 | print_help (); | 275 | print_help (); |
276 | exit (STATE_OK); | 276 | exit (STATE_UNKNOWN); |
277 | case '?': /* help */ | 277 | case '?': /* help */ |
278 | usage5 (); | 278 | usage5 (); |
279 | } | 279 | } |
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index 216626b..5773afd 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c | |||
@@ -444,10 +444,10 @@ process_arguments (int argc, char **argv) | |||
444 | break; | 444 | break; |
445 | case 'V': /* version */ | 445 | case 'V': /* version */ |
446 | print_revision (progname, NP_VERSION); | 446 | print_revision (progname, NP_VERSION); |
447 | exit (STATE_OK); | 447 | exit (STATE_UNKNOWN); |
448 | case 'h': /* help */ | 448 | case 'h': /* help */ |
449 | print_help (); | 449 | print_help (); |
450 | exit (STATE_OK); | 450 | exit (STATE_UNKNOWN); |
451 | case 'v': | 451 | case 'v': |
452 | verbose++; | 452 | verbose++; |
453 | break; | 453 | break; |
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c index 71ab776..49a14dd 100644 --- a/plugins/check_mysql_query.c +++ b/plugins/check_mysql_query.c | |||
@@ -250,10 +250,10 @@ process_arguments (int argc, char **argv) | |||
250 | break; | 250 | break; |
251 | case 'V': /* version */ | 251 | case 'V': /* version */ |
252 | print_revision (progname, NP_VERSION); | 252 | print_revision (progname, NP_VERSION); |
253 | exit (STATE_OK); | 253 | exit (STATE_UNKNOWN); |
254 | case 'h': /* help */ | 254 | case 'h': /* help */ |
255 | print_help (); | 255 | print_help (); |
256 | exit (STATE_OK); | 256 | exit (STATE_UNKNOWN); |
257 | case 'q': | 257 | case 'q': |
258 | xasprintf(&sql_query, "%s", optarg); | 258 | xasprintf(&sql_query, "%s", optarg); |
259 | break; | 259 | break; |
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c index 791b6db..40d68f0 100644 --- a/plugins/check_nagios.c +++ b/plugins/check_nagios.c | |||
@@ -235,10 +235,10 @@ process_arguments (int argc, char **argv) | |||
235 | switch (c) { | 235 | switch (c) { |
236 | case 'h': /* help */ | 236 | case 'h': /* help */ |
237 | print_help (); | 237 | print_help (); |
238 | exit (STATE_OK); | 238 | exit (STATE_UNKNOWN); |
239 | case 'V': /* version */ | 239 | case 'V': /* version */ |
240 | print_revision (progname, NP_VERSION); | 240 | print_revision (progname, NP_VERSION); |
241 | exit (STATE_OK); | 241 | exit (STATE_UNKNOWN); |
242 | case 'F': /* status log */ | 242 | case 'F': /* status log */ |
243 | status_log = optarg; | 243 | status_log = optarg; |
244 | break; | 244 | break; |
diff --git a/plugins/check_nt.c b/plugins/check_nt.c index f621b0a..59c135d 100644 --- a/plugins/check_nt.c +++ b/plugins/check_nt.c | |||
@@ -553,10 +553,10 @@ int process_arguments(int argc, char **argv){ | |||
553 | usage5 (); | 553 | usage5 (); |
554 | case 'h': /* help */ | 554 | case 'h': /* help */ |
555 | print_help(); | 555 | print_help(); |
556 | exit(STATE_OK); | 556 | exit(STATE_UNKNOWN); |
557 | case 'V': /* version */ | 557 | case 'V': /* version */ |
558 | print_revision(progname, NP_VERSION); | 558 | print_revision(progname, NP_VERSION); |
559 | exit(STATE_OK); | 559 | exit(STATE_UNKNOWN); |
560 | case 'H': /* hostname */ | 560 | case 'H': /* hostname */ |
561 | server_address = optarg; | 561 | server_address = optarg; |
562 | break; | 562 | break; |
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index a7d278d..75efc28 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c | |||
@@ -691,11 +691,11 @@ int process_arguments(int argc, char **argv){ | |||
691 | switch (c) { | 691 | switch (c) { |
692 | case 'h': | 692 | case 'h': |
693 | print_help(); | 693 | print_help(); |
694 | exit(STATE_OK); | 694 | exit(STATE_UNKNOWN); |
695 | break; | 695 | break; |
696 | case 'V': | 696 | case 'V': |
697 | print_revision(progname, NP_VERSION); | 697 | print_revision(progname, NP_VERSION); |
698 | exit(STATE_OK); | 698 | exit(STATE_UNKNOWN); |
699 | break; | 699 | break; |
700 | case 'v': | 700 | case 'v': |
701 | verbose++; | 701 | verbose++; |
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index 44424af..c656b0f 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c | |||
@@ -448,11 +448,11 @@ int process_arguments(int argc, char **argv){ | |||
448 | switch (c) { | 448 | switch (c) { |
449 | case 'h': | 449 | case 'h': |
450 | print_help(); | 450 | print_help(); |
451 | exit(STATE_OK); | 451 | exit(STATE_UNKNOWN); |
452 | break; | 452 | break; |
453 | case 'V': | 453 | case 'V': |
454 | print_revision(progname, NP_VERSION); | 454 | print_revision(progname, NP_VERSION); |
455 | exit(STATE_OK); | 455 | exit(STATE_UNKNOWN); |
456 | break; | 456 | break; |
457 | case 'v': | 457 | case 'v': |
458 | verbose++; | 458 | verbose++; |
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index e344f8b..295f86f 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c | |||
@@ -477,11 +477,11 @@ int process_arguments(int argc, char **argv){ | |||
477 | switch (c) { | 477 | switch (c) { |
478 | case 'h': | 478 | case 'h': |
479 | print_help(); | 479 | print_help(); |
480 | exit(STATE_OK); | 480 | exit(STATE_UNKNOWN); |
481 | break; | 481 | break; |
482 | case 'V': | 482 | case 'V': |
483 | print_revision(progname, NP_VERSION); | 483 | print_revision(progname, NP_VERSION); |
484 | exit(STATE_OK); | 484 | exit(STATE_UNKNOWN); |
485 | break; | 485 | break; |
486 | case 'v': | 486 | case 'v': |
487 | verbose++; | 487 | verbose++; |
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c index 1a7bfa1..e7e8de0 100644 --- a/plugins/check_nwstat.c +++ b/plugins/check_nwstat.c | |||
@@ -1354,10 +1354,10 @@ int process_arguments(int argc, char **argv) { | |||
1354 | usage5 (); | 1354 | usage5 (); |
1355 | case 'h': /* help */ | 1355 | case 'h': /* help */ |
1356 | print_help(); | 1356 | print_help(); |
1357 | exit(STATE_OK); | 1357 | exit(STATE_UNKNOWN); |
1358 | case 'V': /* version */ | 1358 | case 'V': /* version */ |
1359 | print_revision(progname, NP_VERSION); | 1359 | print_revision(progname, NP_VERSION); |
1360 | exit(STATE_OK); | 1360 | exit(STATE_UNKNOWN); |
1361 | case 'H': /* hostname */ | 1361 | case 'H': /* hostname */ |
1362 | server_address=optarg; | 1362 | server_address=optarg; |
1363 | break; | 1363 | break; |
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c index af5eb9b..9a4d25f 100644 --- a/plugins/check_overcr.c +++ b/plugins/check_overcr.c | |||
@@ -340,10 +340,10 @@ process_arguments (int argc, char **argv) | |||
340 | usage5 (); | 340 | usage5 (); |
341 | case 'h': /* help */ | 341 | case 'h': /* help */ |
342 | print_help (); | 342 | print_help (); |
343 | exit (STATE_OK); | 343 | exit (STATE_UNKNOWN); |
344 | case 'V': /* version */ | 344 | case 'V': /* version */ |
345 | print_revision (progname, NP_VERSION); | 345 | print_revision (progname, NP_VERSION); |
346 | exit (STATE_OK); | 346 | exit (STATE_UNKNOWN); |
347 | case 'H': /* hostname */ | 347 | case 'H': /* hostname */ |
348 | server_address = optarg; | 348 | server_address = optarg; |
349 | break; | 349 | break; |
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c index 9bad1ec..2eb699e 100644 --- a/plugins/check_pgsql.c +++ b/plugins/check_pgsql.c | |||
@@ -302,10 +302,10 @@ process_arguments (int argc, char **argv) | |||
302 | usage5 (); | 302 | usage5 (); |
303 | case 'h': /* help */ | 303 | case 'h': /* help */ |
304 | print_help (); | 304 | print_help (); |
305 | exit (STATE_OK); | 305 | exit (STATE_UNKNOWN); |
306 | case 'V': /* version */ | 306 | case 'V': /* version */ |
307 | print_revision (progname, NP_VERSION); | 307 | print_revision (progname, NP_VERSION); |
308 | exit (STATE_OK); | 308 | exit (STATE_UNKNOWN); |
309 | case 't': /* timeout period */ | 309 | case 't': /* timeout period */ |
310 | if (!is_integer (optarg)) | 310 | if (!is_integer (optarg)) |
311 | usage2 (_("Timeout interval must be a positive integer"), optarg); | 311 | usage2 (_("Timeout interval must be a positive integer"), optarg); |
diff --git a/plugins/check_ping.c b/plugins/check_ping.c index dbc5c3e..423ecbe 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c | |||
@@ -224,11 +224,11 @@ process_arguments (int argc, char **argv) | |||
224 | usage5 (); | 224 | usage5 (); |
225 | case 'h': /* help */ | 225 | case 'h': /* help */ |
226 | print_help (); | 226 | print_help (); |
227 | exit (STATE_OK); | 227 | exit (STATE_UNKNOWN); |
228 | break; | 228 | break; |
229 | case 'V': /* version */ | 229 | case 'V': /* version */ |
230 | print_revision (progname, NP_VERSION); | 230 | print_revision (progname, NP_VERSION); |
231 | exit (STATE_OK); | 231 | exit (STATE_UNKNOWN); |
232 | break; | 232 | break; |
233 | case 't': /* timeout period */ | 233 | case 't': /* timeout period */ |
234 | timeout_interval = atoi (optarg); | 234 | timeout_interval = atoi (optarg); |
diff --git a/plugins/check_procs.c b/plugins/check_procs.c index 402aac5..4bcc56b 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c | |||
@@ -428,10 +428,10 @@ process_arguments (int argc, char **argv) | |||
428 | usage5 (); | 428 | usage5 (); |
429 | case 'h': /* help */ | 429 | case 'h': /* help */ |
430 | print_help (); | 430 | print_help (); |
431 | exit (STATE_OK); | 431 | exit (STATE_UNKNOWN); |
432 | case 'V': /* version */ | 432 | case 'V': /* version */ |
433 | print_revision (progname, NP_VERSION); | 433 | print_revision (progname, NP_VERSION); |
434 | exit (STATE_OK); | 434 | exit (STATE_UNKNOWN); |
435 | case 't': /* timeout period */ | 435 | case 't': /* timeout period */ |
436 | if (!is_integer (optarg)) | 436 | if (!is_integer (optarg)) |
437 | usage2 (_("Timeout interval must be a positive integer"), optarg); | 437 | usage2 (_("Timeout interval must be a positive integer"), optarg); |
diff --git a/plugins/check_radius.c b/plugins/check_radius.c index b294347..03cbb8b 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c | |||
@@ -259,10 +259,10 @@ process_arguments (int argc, char **argv) | |||
259 | usage5 (); | 259 | usage5 (); |
260 | case 'h': /* help */ | 260 | case 'h': /* help */ |
261 | print_help (); | 261 | print_help (); |
262 | exit (OK); | 262 | exit (STATE_UNKNOWN); |
263 | case 'V': /* version */ | 263 | case 'V': /* version */ |
264 | print_revision (progname, NP_VERSION); | 264 | print_revision (progname, NP_VERSION); |
265 | exit (OK); | 265 | exit (STATE_UNKNOWN); |
266 | case 'v': /* verbose mode */ | 266 | case 'v': /* verbose mode */ |
267 | verbose = TRUE; | 267 | verbose = TRUE; |
268 | break; | 268 | break; |
diff --git a/plugins/check_real.c b/plugins/check_real.c index 00bd4d2..6491e6e 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c | |||
@@ -359,10 +359,10 @@ process_arguments (int argc, char **argv) | |||
359 | break; | 359 | break; |
360 | case 'V': /* version */ | 360 | case 'V': /* version */ |
361 | print_revision (progname, NP_VERSION); | 361 | print_revision (progname, NP_VERSION); |
362 | exit (STATE_OK); | 362 | exit (STATE_UNKNOWN); |
363 | case 'h': /* help */ | 363 | case 'h': /* help */ |
364 | print_help (); | 364 | print_help (); |
365 | exit (STATE_OK); | 365 | exit (STATE_UNKNOWN); |
366 | case '?': /* usage */ | 366 | case '?': /* usage */ |
367 | usage5 (); | 367 | usage5 (); |
368 | } | 368 | } |
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 2430453..56040ff 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c | |||
@@ -623,10 +623,10 @@ process_arguments (int argc, char **argv) | |||
623 | break; | 623 | break; |
624 | case 'V': /* version */ | 624 | case 'V': /* version */ |
625 | print_revision (progname, NP_VERSION); | 625 | print_revision (progname, NP_VERSION); |
626 | exit (STATE_OK); | 626 | exit (STATE_UNKNOWN); |
627 | case 'h': /* help */ | 627 | case 'h': /* help */ |
628 | print_help (); | 628 | print_help (); |
629 | exit (STATE_OK); | 629 | exit (STATE_UNKNOWN); |
630 | case '?': /* help */ | 630 | case '?': /* help */ |
631 | usage5 (); | 631 | usage5 (); |
632 | } | 632 | } |
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 62e6b8b..28cc44d 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c | |||
@@ -709,10 +709,10 @@ process_arguments (int argc, char **argv) | |||
709 | usage5 (); | 709 | usage5 (); |
710 | case 'h': /* help */ | 710 | case 'h': /* help */ |
711 | print_help (); | 711 | print_help (); |
712 | exit (STATE_OK); | 712 | exit (STATE_UNKNOWN); |
713 | case 'V': /* version */ | 713 | case 'V': /* version */ |
714 | print_revision (progname, NP_VERSION); | 714 | print_revision (progname, NP_VERSION); |
715 | exit (STATE_OK); | 715 | exit (STATE_UNKNOWN); |
716 | case 'v': /* verbose */ | 716 | case 'v': /* verbose */ |
717 | verbose++; | 717 | verbose++; |
718 | break; | 718 | break; |
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index 3658965..8ccbd5a 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c | |||
@@ -128,10 +128,10 @@ process_arguments (int argc, char **argv) | |||
128 | usage5 (); | 128 | usage5 (); |
129 | case 'V': /* version */ | 129 | case 'V': /* version */ |
130 | print_revision (progname, NP_VERSION); | 130 | print_revision (progname, NP_VERSION); |
131 | exit (STATE_OK); | 131 | exit (STATE_UNKNOWN); |
132 | case 'h': /* help */ | 132 | case 'h': /* help */ |
133 | print_help (); | 133 | print_help (); |
134 | exit (STATE_OK); | 134 | exit (STATE_UNKNOWN); |
135 | case 'v': /* verbose */ | 135 | case 'v': /* verbose */ |
136 | verbose = TRUE; | 136 | verbose = TRUE; |
137 | break; | 137 | break; |
diff --git a/plugins/check_swap.c b/plugins/check_swap.c index 25e0bac..4d5a407 100644 --- a/plugins/check_swap.c +++ b/plugins/check_swap.c | |||
@@ -470,10 +470,10 @@ process_arguments (int argc, char **argv) | |||
470 | break; | 470 | break; |
471 | case 'V': /* version */ | 471 | case 'V': /* version */ |
472 | print_revision (progname, NP_VERSION); | 472 | print_revision (progname, NP_VERSION); |
473 | exit (STATE_OK); | 473 | exit (STATE_UNKNOWN); |
474 | case 'h': /* help */ | 474 | case 'h': /* help */ |
475 | print_help (); | 475 | print_help (); |
476 | exit (STATE_OK); | 476 | exit (STATE_UNKNOWN); |
477 | case '?': /* error */ | 477 | case '?': /* error */ |
478 | usage5 (); | 478 | usage5 (); |
479 | } | 479 | } |
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index 5c563d8..6dc9aa9 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c | |||
@@ -463,10 +463,10 @@ process_arguments (int argc, char **argv) | |||
463 | usage5 (); | 463 | usage5 (); |
464 | case 'h': /* help */ | 464 | case 'h': /* help */ |
465 | print_help (); | 465 | print_help (); |
466 | exit (STATE_OK); | 466 | exit (STATE_UNKNOWN); |
467 | case 'V': /* version */ | 467 | case 'V': /* version */ |
468 | print_revision (progname, NP_VERSION); | 468 | print_revision (progname, NP_VERSION); |
469 | exit (STATE_OK); | 469 | exit (STATE_UNKNOWN); |
470 | case 'v': /* verbose mode */ | 470 | case 'v': /* verbose mode */ |
471 | flags |= FLAG_VERBOSE; | 471 | flags |= FLAG_VERBOSE; |
472 | match_flags |= NP_MATCH_VERBOSE; | 472 | match_flags |= NP_MATCH_VERBOSE; |
diff --git a/plugins/check_time.c b/plugins/check_time.c index 3943742..baf8c59 100644 --- a/plugins/check_time.c +++ b/plugins/check_time.c | |||
@@ -231,10 +231,10 @@ process_arguments (int argc, char **argv) | |||
231 | usage5 (); | 231 | usage5 (); |
232 | case 'h': /* help */ | 232 | case 'h': /* help */ |
233 | print_help (); | 233 | print_help (); |
234 | exit (STATE_OK); | 234 | exit (STATE_UNKNOWN); |
235 | case 'V': /* version */ | 235 | case 'V': /* version */ |
236 | print_revision (progname, NP_VERSION); | 236 | print_revision (progname, NP_VERSION); |
237 | exit (STATE_OK); | 237 | exit (STATE_UNKNOWN); |
238 | case 'H': /* hostname */ | 238 | case 'H': /* hostname */ |
239 | if (is_host (optarg) == FALSE) | 239 | if (is_host (optarg) == FALSE) |
240 | usage2 (_("Invalid hostname/address"), optarg); | 240 | usage2 (_("Invalid hostname/address"), optarg); |
diff --git a/plugins/check_ups.c b/plugins/check_ups.c index 099881d..dc5a348 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c | |||
@@ -558,10 +558,10 @@ process_arguments (int argc, char **argv) | |||
558 | break; | 558 | break; |
559 | case 'V': /* version */ | 559 | case 'V': /* version */ |
560 | print_revision (progname, NP_VERSION); | 560 | print_revision (progname, NP_VERSION); |
561 | exit (STATE_OK); | 561 | exit (STATE_UNKNOWN); |
562 | case 'h': /* help */ | 562 | case 'h': /* help */ |
563 | print_help (); | 563 | print_help (); |
564 | exit (STATE_OK); | 564 | exit (STATE_UNKNOWN); |
565 | } | 565 | } |
566 | } | 566 | } |
567 | 567 | ||
diff --git a/plugins/check_users.c b/plugins/check_users.c index a009f20..54415a4 100644 --- a/plugins/check_users.c +++ b/plugins/check_users.c | |||
@@ -210,10 +210,10 @@ process_arguments (int argc, char **argv) | |||
210 | usage5 (); | 210 | usage5 (); |
211 | case 'h': /* help */ | 211 | case 'h': /* help */ |
212 | print_help (); | 212 | print_help (); |
213 | exit (STATE_OK); | 213 | exit (STATE_UNKNOWN); |
214 | case 'V': /* version */ | 214 | case 'V': /* version */ |
215 | print_revision (progname, NP_VERSION); | 215 | print_revision (progname, NP_VERSION); |
216 | exit (STATE_OK); | 216 | exit (STATE_UNKNOWN); |
217 | case 'c': /* critical */ | 217 | case 'c': /* critical */ |
218 | if (!is_intnonneg (optarg)) | 218 | if (!is_intnonneg (optarg)) |
219 | usage4 (_("Critical threshold must be a positive integer")); | 219 | usage4 (_("Critical threshold must be a positive integer")); |