diff --git a/plugins/utils.h b/plugins/utils.h
index def89705c7c1e4424b0d1315c603cfcf8ec4c80f..d6e9c8f7211149d46e821686953b9fea672f5ad0 100644 (file)
--- a/plugins/utils.h
+++ b/plugins/utils.h
/* now some functions etc are being defined in ../lib/utils_base.c */
#include "utils_base.h"
-/* Standardize version information, termination */
+#ifdef NP_EXTRA_OPTS
+/* Include extra-opts functions if compiled in */
+#include "extra_opts.h"
+#else
+/* else, fake np_extra_opts */
+#define np_extra_opts(acptr,av,pr) av
+#endif
-/* $Id$ */
+/* Standardize version information, termination */
void support (void);
-char *clean_revstring (const char *);
void print_revision (const char *, const char *);
/* Handle timeouts */
#ifdef LOCAL_TIMEOUT_ALARM_HANDLER
+extern unsigned int timeout_state;
extern unsigned int timeout_interval;
RETSIGTYPE timeout_alarm_handler (int);
#else
+unsigned int timeout_state = STATE_CRITICAL;
unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
extern RETSIGTYPE timeout_alarm_handler (int);
#endif
-t, --timeout=INTEGER\n\
Seconds before connection times out (default: %d)\n"
+#ifdef NP_EXTRA_OPTS
+#define UT_EXTRA_OPTS "\
+ --extra-opts=[section][@file]\n\
+ Read additionnal options from ini file\n"
+#define UT_EXTRA_OPTS_NOTES "\
+ See: http://nagiosplugins.org/extra-opts for --extra-opts usage and examples.\n"
+#else
+#define UT_EXTRA_OPTS ""
+#define UT_EXTRA_OPTS_NOTES ""
+#endif
+
#define UT_THRESHOLDS_NOTES "\
See:\n\
http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT\n\