From b2429e1779cb86c9e6108bf0ffdf561b07a96327 Mon Sep 17 00:00:00 2001
From: okan
Date: Mon, 22 Aug 2011 16:18:05 +0000
Subject: revert r1.11 of parse.y and create logic in conf_setup instead to
 deal with the various scenarios of when to attempt a parse of the config,
 load defaults, and when to warn and/or exit.  triggered by bogus warning
 first noticed by sobrado@.

ok oga@
---
 parse.y | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 94dc862..5421b12 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.29 2011/07/25 15:10:24 okan Exp $ */
+/*	$OpenBSD: parse.y,v 1.30 2011/08/22 16:18:05 okan Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -462,8 +462,6 @@ pushfile(const char *name)
 	nfile->name = xstrdup(name);
 
 	if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-		if (errno != ENOENT)
-			warn("%s", nfile->name);
 		free(nfile->name);
 		free(nfile);
 		return (NULL);
-- 
cgit v1.2.3-2-gb3c3