From owner-svn-src-all@FreeBSD.ORG  Wed Jun 27 06:41:11 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7F58410657E6;
	Wed, 27 Jun 2012 06:41:11 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 699D78FC14;
	Wed, 27 Jun 2012 06:41:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5R6fBGl087639;
	Wed, 27 Jun 2012 06:41:11 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5R6fBpq087637;
	Wed, 27 Jun 2012 06:41:11 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201206270641.q5R6fBpq087637@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 27 Jun 2012 06:41:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237633 - stable/7/lib/libc/gen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jun 2012 06:41:11 -0000

Author: eadler
Date: Wed Jun 27 06:41:10 2012
New Revision: 237633
URL: http://svn.freebsd.org/changeset/base/237633

Log:
  MFC r237286, r237523:
  	Don't close an uninitialized descriptor.
  
  PR:		bin/167302
  Approved by:	cperciva (implicit)

Modified:
  stable/7/lib/libc/gen/syslog.c
Directory Properties:
  stable/7/lib/libc/   (props changed)

Modified: stable/7/lib/libc/gen/syslog.c
==============================================================================
--- stable/7/lib/libc/gen/syslog.c	Wed Jun 27 06:40:59 2012	(r237632)
+++ stable/7/lib/libc/gen/syslog.c	Wed Jun 27 06:41:10 2012	(r237633)
@@ -413,8 +413,10 @@ void
 closelog(void)
 {
 	THREAD_LOCK();
-	(void)_close(LogFile);
-	LogFile = -1;
+	if (LogFile != -1) {
+		(void)_close(LogFile);
+		LogFile = -1;
+	}
 	LogTag = NULL;
 	status = NOCONN;
 	THREAD_UNLOCK();