diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | NEWS | 11 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | git2chg.awk | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/auth.c | 2 | ||||
-rw-r--r-- | src/ban.c | 6 | ||||
-rw-r--r-- | src/betab.c | 5 | ||||
-rw-r--r-- | src/varnish-mib.8 | 2 | ||||
-rw-r--r-- | src/varnish_mib.mib2c | 14 | ||||
-rw-r--r-- | src/vcli.c | 2 |
12 files changed, 29 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index 9f585f9..0334f01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ # This file is part of varnish-mib -*- automake -*- -# Copyright (C) 2014 Sergey Poznyakoff +# Copyright (C) 2014-2015 Sergey Poznyakoff # @@ -1,3 +1,3 @@ -Varnish-mib NEWS -- history of user-visible changes. 2014-11-28 -Copyright (C) 2014 Sergey Poznyakoff +Varnish-mib NEWS -- history of user-visible changes. 2015-02-02 +Copyright (C) 2014-2015 Sergey Poznyakoff See the end of file for copying conditions. @@ -6,2 +6,7 @@ Please send Varnish-mib bug reports to <gray@gnu.org> +Version 1.0.90 (Git) + +* Don't exit if unable to open Varnish memory file + + Version 1.0, 2014-11-28 @@ -13,3 +18,3 @@ Initial release. -Copyright (C) 2014 Sergey Poznyakoff +Copyright (C) 2014-2015 Sergey Poznyakoff @@ -1,3 +1,3 @@ Varnish-mib README -Copyright (C) 2014 Sergey Poznyakoff +Copyright (C) 2014-2015 Sergey Poznyakoff See the end of file for copying conditions. diff --git a/configure.ac b/configure.ac index 9b4d998..b5d6636 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,3 @@ # This file is part of Varnish-mib -*- autoconf -*- -# Copyright (C) 2014 Sergey Poznyakoff +# Copyright (C) 2014-2015 Sergey Poznyakoff # @@ -17,3 +17,3 @@ AC_PREREQ(2.69) -AC_INIT([varnish-mib], 1.0, [gray@gnu.org]) +AC_INIT([varnish-mib], 1.0.90, [gray@gnu.org]) AC_CONFIG_SRCDIR(src/varnish_mib.mib2c) diff --git a/git2chg.awk b/git2chg.awk index 6dad87e..e5dbe15 100644 --- a/git2chg.awk +++ b/git2chg.awk @@ -1,3 +1,3 @@ # This file is part of grecs -# Copyright (C) 2007-2014 Sergey Poznyakoff +# Copyright (C) 2007-2015 Sergey Poznyakoff # diff --git a/src/Makefile.am b/src/Makefile.am index a10abd1..3c066f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,3 @@ # This file is part of varnish-mib -*- automake -*- -# Copyright (C) 2014 Sergey Poznyakoff +# Copyright (C) 2014-2015 Sergey Poznyakoff # @@ -1,3 +1,3 @@ /* This file is part of varnish-mib -*- c -*- - Copyright (C) 2014 Sergey Poznyakoff + Copyright (C) 2014-2015 Sergey Poznyakoff @@ -1,3 +1,3 @@ /* This file is part of varnish-mib -*- c -*- - Copyright (C) 2014 Sergey Poznyakoff + Copyright (C) 2014-2015 Sergey Poznyakoff @@ -157,5 +157,7 @@ banTable_load(netsnmp_cache *cache, void *vmagic) vd = varnish_get_vsm_data(); + if (!vd) + return SNMP_ERR_NOSUCHNAME; rc = vcli_connect(vd, &conn); if (rc != SNMP_ERR_NOERROR) - return rc; + return rc; diff --git a/src/betab.c b/src/betab.c index 41c18e7..b583958 100644 --- a/src/betab.c +++ b/src/betab.c @@ -225,5 +225,8 @@ backendTable_load(netsnmp_cache *cache, void *vmagic) { - struct VSM_data *vd = varnish_get_vsm_data(); struct betab_priv bp; + struct VSM_data *vd = varnish_get_vsm_data(); + if (!vd) + return SNMP_ERR_NOSUCHNAME; + bp.idx = -1; diff --git a/src/varnish-mib.8 b/src/varnish-mib.8 index cc3276b..4559b0c 100644 --- a/src/varnish-mib.8 +++ b/src/varnish-mib.8 @@ -1,3 +1,3 @@ .\" This file is part of Varnish-mib -*- nroff -*- -.\" Copyright (C) 2014 Sergey Poznyakoff +.\" Copyright (C) 2014-2015 Sergey Poznyakoff .\" diff --git a/src/varnish_mib.mib2c b/src/varnish_mib.mib2c index ae344be..a5367e0 100644 --- a/src/varnish_mib.mib2c +++ b/src/varnish_mib.mib2c @@ -1,3 +1,3 @@ # This file is part of varnish-mib -*- c -*- -# Copyright (C) 2014 Sergey Poznyakoff +# Copyright (C) 2014-2015 Sergey Poznyakoff # @@ -200,5 +200,2 @@ varnish_snmp_init(void) vd = VSM_New(); - - if (VSM_Open(vd)) - exit(1); } @@ -242,8 +239,5 @@ handle_$i(netsnmp_mib_handler *handler, @endperl@ - - if (VSM_Abandoned(vd)) { - DEBUGMSGTL(("$modulename", "reopening vd\n")); - VSM_Close(vd); - VSM_Open(vd); - } + + if (!varnish_get_vsm_data()) + return SNMP_ERR_NOSUCHNAME; @@ -1,3 +1,3 @@ /* This file is part of varnish-mib -*- c -*- - Copyright (C) 2014 Sergey Poznyakoff + Copyright (C) 2014-2015 Sergey Poznyakoff |