head 1.1; branch 1.1.1; access; symbols netbsd-11-0-RC4:1.1.1.1 netbsd-11-0-RC3:1.1.1.1 netbsd-11-0-RC2:1.1.1.1 netbsd-11-0-RC1:1.1.1.1 unbound-1-24-2:1.1.1.1 unbound-1-23-1:1.1.1.1 perseant-exfatfs-base-20250801:1.1.1.1 netbsd-11:1.1.1.1.0.30 netbsd-11-base:1.1.1.1 netbsd-10-1-RELEASE:1.1.1.1 perseant-exfatfs-base-20240630:1.1.1.1 perseant-exfatfs:1.1.1.1.0.28 perseant-exfatfs-base:1.1.1.1 netbsd-8-3-RELEASE:1.1.1.1 netbsd-9-4-RELEASE:1.1.1.1 netbsd-10-0-RELEASE:1.1.1.1 netbsd-10-0-RC6:1.1.1.1 netbsd-10-0-RC5:1.1.1.1 unbound-1-19-1:1.1.1.1 netbsd-10-0-RC4:1.1.1.1 netbsd-10-0-RC3:1.1.1.1 netbsd-10-0-RC2:1.1.1.1 netbsd-10-0-RC1:1.1.1.1 netbsd-10:1.1.1.1.0.26 netbsd-10-base:1.1.1.1 unbound-1-16-3:1.1.1.1 netbsd-9-3-RELEASE:1.1.1.1 cjep_sun2x-base1:1.1.1.1 cjep_sun2x:1.1.1.1.0.24 cjep_sun2x-base:1.1.1.1 cjep_staticlib_x-base1:1.1.1.1 netbsd-9-2-RELEASE:1.1.1.1 cjep_staticlib_x:1.1.1.1.0.22 cjep_staticlib_x-base:1.1.1.1 unbound-1-13-1:1.1.1.1 netbsd-9-1-RELEASE:1.1.1.1 phil-wifi-20200421:1.1.1.1 phil-wifi-20200411:1.1.1.1 is-mlppp:1.1.1.1.0.20 is-mlppp-base:1.1.1.1 phil-wifi-20200406:1.1.1.1 netbsd-8-2-RELEASE:1.1.1.1 netbsd-9-0-RELEASE:1.1.1.1 netbsd-9-0-RC2:1.1.1.1 unbound-1-9-6:1.1.1.1 netbsd-9-0-RC1:1.1.1.1 phil-wifi-20191119:1.1.1.1 netbsd-9:1.1.1.1.0.18 netbsd-9-base:1.1.1.1 phil-wifi-20190609:1.1.1.1 netbsd-8-1-RELEASE:1.1.1.1 unbound-1-9-1:1.1.1.1 netbsd-8-1-RC1:1.1.1.1 pgoyette-compat-merge-20190127:1.1.1.1 pgoyette-compat-20190127:1.1.1.1 pgoyette-compat-20190118:1.1.1.1 pgoyette-compat-1226:1.1.1.1 pgoyette-compat-1126:1.1.1.1 pgoyette-compat-1020:1.1.1.1 pgoyette-compat-0930:1.1.1.1 pgoyette-compat-0906:1.1.1.1 unbound-1-7-3:1.1.1.1 pgoyette-compat-0728:1.1.1.1 netbsd-8-0-RELEASE:1.1.1.1 phil-wifi:1.1.1.1.0.16 phil-wifi-base:1.1.1.1 pgoyette-compat-0625:1.1.1.1 netbsd-8-0-RC2:1.1.1.1 pgoyette-compat-0521:1.1.1.1 pgoyette-compat-0502:1.1.1.1 pgoyette-compat-0422:1.1.1.1 netbsd-8-0-RC1:1.1.1.1 pgoyette-compat-0415:1.1.1.1 pgoyette-compat-0407:1.1.1.1 pgoyette-compat-0330:1.1.1.1 pgoyette-compat-0322:1.1.1.1 pgoyette-compat-0315:1.1.1.1 pgoyette-compat:1.1.1.1.0.14 pgoyette-compat-base:1.1.1.1 unbound-1-6-8:1.1.1.1 matt-nb8-mediatek:1.1.1.1.0.12 matt-nb8-mediatek-base:1.1.1.1 perseant-stdc-iso10646:1.1.1.1.0.10 perseant-stdc-iso10646-base:1.1.1.1 netbsd-8:1.1.1.1.0.8 netbsd-8-base:1.1.1.1 prg-localcount2-base3:1.1.1.1 prg-localcount2-base2:1.1.1.1 prg-localcount2-base1:1.1.1.1 prg-localcount2:1.1.1.1.0.6 prg-localcount2-base:1.1.1.1 pgoyette-localcount-20170426:1.1.1.1 bouyer-socketcan-base1:1.1.1.1 pgoyette-localcount-20170320:1.1.1.1 bouyer-socketcan:1.1.1.1.0.4 bouyer-socketcan-base:1.1.1.1 pgoyette-localcount-20170107:1.1.1.1 pgoyette-localcount-20161104:1.1.1.1 pgoyette-localcount:1.1.1.1.0.2 localcount-20160914:1.1.1.1 unbound-1-5-9:1.1.1.1 NLNETLABS:1.1.1; locks; strict; comment @# @; 1.1 date 2016.08.20.11.09.28; author christos; state Exp; branches 1.1.1.1; next ; commitid TgCvoOC8yQxac2jz; 1.1.1.1 date 2016.08.20.11.09.28; author christos; state Exp; branches 1.1.1.1.2.1; next ; commitid TgCvoOC8yQxac2jz; 1.1.1.1.2.1 date 2016.08.20.11.09.28; author pgoyette; state dead; branches; next 1.1.1.1.2.2; commitid 0FvUzdNwg07UHcmz; 1.1.1.1.2.2 date 2016.09.14.03.04.07; author pgoyette; state Exp; branches; next ; commitid 0FvUzdNwg07UHcmz; desc @@ 1.1 log @Initial revision @ text @Index: smallapp/unbound-host.c =================================================================== --- smallapp/unbound-host.c (revision 2115) +++ smallapp/unbound-host.c (working copy) @@@@ -62,9 +62,18 @@@@ #include "libunbound/unbound.h" #include +/** status variable ala nagios */ +#define FINAL_STATUS_OK 0 +#define FINAL_STATUS_WARNING 1 +#define FINAL_STATUS_CRITICAL 2 +#define FINAL_STATUS_UNKNOWN 3 + /** verbosity for unbound-host app */ static int verb = 0; +/** variable to determine final output */ +static int final_status = FINAL_STATUS_UNKNOWN; + /** Give unbound-host usage, and exit (1). */ static void usage() @@@@ -93,7 +102,7 @@@@ printf("Version %s\n", PACKAGE_VERSION); printf("BSD licensed, see LICENSE in source package for details.\n"); printf("Report bugs to %s\n", PACKAGE_BUGREPORT); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } /** determine if str is ip4 and put into reverse lookup format */ @@@@ -138,7 +147,7 @@@@ *res = strdup(buf); if(!*res) { fprintf(stderr, "error: out of memory\n"); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } return 1; } @@@@ -158,7 +167,7 @@@@ } if(!res) { fprintf(stderr, "error: out of memory\n"); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } return res; } @@@@ -172,7 +181,7 @@@@ if(r == 0 && strcasecmp(t, "TYPE0") != 0 && strcmp(t, "") != 0) { fprintf(stderr, "error unknown type %s\n", t); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } return r; } @@@@ -191,7 +200,7 @@@@ if(r == 0 && strcasecmp(c, "CLASS0") != 0 && strcmp(c, "") != 0) { fprintf(stderr, "error unknown class %s\n", c); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } return r; } @@@@ -207,6 +216,19 @@@@ return "(insecure)"; } +/** update the final status for the exit code */ +void +update_final_status(struct ub_result* result) +{ + if (final_status == FINAL_STATUS_UNKNOWN || final_status == FINAL_STATUS_OK) { + if (result->secure) final_status = FINAL_STATUS_OK; + else if (result->bogus) final_status = FINAL_STATUS_CRITICAL; + else final_status = FINAL_STATUS_WARNING; + } + else if (final_status == FINAL_STATUS_WARNING && result->bogus) + final_status = FINAL_STATUS_CRITICAL; +} + /** nice string for type */ static void pretty_type(char* s, size_t len, int t) @@@@ -353,7 +375,7 @@@@ } else { fprintf(stderr, "could not parse " "reply packet to ANY query\n"); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } ldns_pkt_free(p); @@@@ -388,9 +410,10 @@@@ ret = ub_resolve(ctx, q, t, c, &result); if(ret != 0) { fprintf(stderr, "resolve error: %s\n", ub_strerror(ret)); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } pretty_output(q, t, c, result, docname); + update_final_status(result); ret = result->nxdomain; ub_resolve_free(result); return ret; @@@@ -427,7 +450,7 @@@@ { if(r != 0) { fprintf(stderr, "error: %s\n", ub_strerror(r)); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } } @@@@ -448,7 +471,7 @@@@ ctx = ub_ctx_create(); if(!ctx) { fprintf(stderr, "error: out of memory\n"); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } /* parse the options */ @@@@ -509,5 +532,5 @@@@ usage(); lookup(ctx, argv[0], qtype, qclass); - return 0; + return final_status; } @ 1.1.1.1 log @Import unbound 1.5.9 @ text @@ 1.1.1.1.2.1 log @file unbound-host.nagios.patch was added on branch pgoyette-localcount on 2016-09-14 03:04:07 +0000 @ text @d1 134 @ 1.1.1.1.2.2 log @Sync with HEAD @ text @a0 134 Index: smallapp/unbound-host.c =================================================================== --- smallapp/unbound-host.c (revision 2115) +++ smallapp/unbound-host.c (working copy) @@@@ -62,9 +62,18 @@@@ #include "libunbound/unbound.h" #include +/** status variable ala nagios */ +#define FINAL_STATUS_OK 0 +#define FINAL_STATUS_WARNING 1 +#define FINAL_STATUS_CRITICAL 2 +#define FINAL_STATUS_UNKNOWN 3 + /** verbosity for unbound-host app */ static int verb = 0; +/** variable to determine final output */ +static int final_status = FINAL_STATUS_UNKNOWN; + /** Give unbound-host usage, and exit (1). */ static void usage() @@@@ -93,7 +102,7 @@@@ printf("Version %s\n", PACKAGE_VERSION); printf("BSD licensed, see LICENSE in source package for details.\n"); printf("Report bugs to %s\n", PACKAGE_BUGREPORT); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } /** determine if str is ip4 and put into reverse lookup format */ @@@@ -138,7 +147,7 @@@@ *res = strdup(buf); if(!*res) { fprintf(stderr, "error: out of memory\n"); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } return 1; } @@@@ -158,7 +167,7 @@@@ } if(!res) { fprintf(stderr, "error: out of memory\n"); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } return res; } @@@@ -172,7 +181,7 @@@@ if(r == 0 && strcasecmp(t, "TYPE0") != 0 && strcmp(t, "") != 0) { fprintf(stderr, "error unknown type %s\n", t); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } return r; } @@@@ -191,7 +200,7 @@@@ if(r == 0 && strcasecmp(c, "CLASS0") != 0 && strcmp(c, "") != 0) { fprintf(stderr, "error unknown class %s\n", c); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } return r; } @@@@ -207,6 +216,19 @@@@ return "(insecure)"; } +/** update the final status for the exit code */ +void +update_final_status(struct ub_result* result) +{ + if (final_status == FINAL_STATUS_UNKNOWN || final_status == FINAL_STATUS_OK) { + if (result->secure) final_status = FINAL_STATUS_OK; + else if (result->bogus) final_status = FINAL_STATUS_CRITICAL; + else final_status = FINAL_STATUS_WARNING; + } + else if (final_status == FINAL_STATUS_WARNING && result->bogus) + final_status = FINAL_STATUS_CRITICAL; +} + /** nice string for type */ static void pretty_type(char* s, size_t len, int t) @@@@ -353,7 +375,7 @@@@ } else { fprintf(stderr, "could not parse " "reply packet to ANY query\n"); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } ldns_pkt_free(p); @@@@ -388,9 +410,10 @@@@ ret = ub_resolve(ctx, q, t, c, &result); if(ret != 0) { fprintf(stderr, "resolve error: %s\n", ub_strerror(ret)); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } pretty_output(q, t, c, result, docname); + update_final_status(result); ret = result->nxdomain; ub_resolve_free(result); return ret; @@@@ -427,7 +450,7 @@@@ { if(r != 0) { fprintf(stderr, "error: %s\n", ub_strerror(r)); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } } @@@@ -448,7 +471,7 @@@@ ctx = ub_ctx_create(); if(!ctx) { fprintf(stderr, "error: out of memory\n"); - exit(1); + exit(FINAL_STATUS_UNKNOWN); } /* parse the options */ @@@@ -509,5 +532,5 @@@@ usage(); lookup(ctx, argv[0], qtype, qclass); - return 0; + return final_status; } @