summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHartmut Brandt <harti@FreeBSD.org>2004-08-12 19:17:29 +0000
committerHartmut Brandt <harti@FreeBSD.org>2004-08-12 19:17:29 +0000
commit181fd12f6c811dcbea933624cf738c04e97a394b (patch)
tree6d0aa02d2dc42bd6f2b2a95c4f197ce355fd5221
parent215431deb0b1d83c7ecece6588e1fd7f519e404f (diff)
parente0fd476003e0c7c14a7c484bc9509903c9552778 (diff)
Notes
-rw-r--r--contrib/bsnmp/snmpd/config.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/bsnmp/snmpd/config.c b/contrib/bsnmp/snmpd/config.c
index 2a690479255b7..f6f5c35a13fcd 100644
--- a/contrib/bsnmp/snmpd/config.c
+++ b/contrib/bsnmp/snmpd/config.c
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Begemot: bsnmp/snmpd/config.c,v 1.21 2004/08/06 08:47:10 brandt Exp $
+ * $Begemot: bsnmp/snmpd/config.c,v 1.22 2004/08/12 17:09:49 brandt Exp $
*
* Parse configuration file.
*/
@@ -1290,13 +1290,18 @@ read_config(const char *fname, struct lmodule *lodmod)
ignore = 0;
input_push = 0;
+
+ if (ERRPUSH())
+ return (-1);
if (input_open_file(fname, 0) == -1) {
syslog(LOG_ERR, "%s: %m", fname);
return (-1);
}
+ ERRPOP();
community = COMM_INITIALIZE;
if ((snmp_ctx = snmp_init_context()) == NULL) {
+ input_close_all();
syslog(LOG_ERR, "%m");
return (-1);
}