From owner-svn-src-all@FreeBSD.ORG  Sun Mar 15 09:15:12 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3B87AD44;
 Sun, 15 Mar 2015 09:15:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 24D8D640;
 Sun, 15 Mar 2015 09:15:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2F9FCVc029699;
 Sun, 15 Mar 2015 09:15:12 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2F9FC6R029698;
 Sun, 15 Mar 2015 09:15:12 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201503150915.t2F9FC6R029698@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ed set sender to ed@FreeBSD.org
 using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 15 Mar 2015 09:15:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r280020 - stable/10/usr.sbin/syslogd
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Sun, 15 Mar 2015 09:15:12 -0000

Author: ed
Date: Sun Mar 15 09:15:11 2015
New Revision: 280020
URL: https://svnweb.freebsd.org/changeset/base/280020

Log:
  MFC r279016:
  
    Make syslogd work in case shutdown() is POSIX-ly correct.
  
    On POSIX conformant systems, shutdown() should return ENOTCONN when not
    connected. We attempted to fix this once (kern/84761), but this change
    got backed out because it 'breaks code' (r150155).
  
    I just reapplied the patch and indeed, syslogd fails on startup. Make it
    easier to re-enable this change in the future by paching up syslogd to
    do the right thing.
  
  Sponsored by: Nuxi

Modified:
  stable/10/usr.sbin/syslogd/syslogd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/syslogd/syslogd.c
==============================================================================
--- stable/10/usr.sbin/syslogd/syslogd.c	Sun Mar 15 09:06:59 2015	(r280019)
+++ stable/10/usr.sbin/syslogd/syslogd.c	Sun Mar 15 09:15:11 2015	(r280020)
@@ -557,7 +557,8 @@ main(int argc, char *argv[])
 	if (finet) {
 		if (SecureMode) {
 			for (i = 0; i < *finet; i++) {
-				if (shutdown(finet[i+1], SHUT_RD) < 0) {
+				if (shutdown(finet[i+1], SHUT_RD) < 0 &&
+				    errno != ENOTCONN) {
 					logerror("shutdown");
 					if (!Debug)
 						die(0);