From owner-svn-src-stable-9@FreeBSD.ORG  Thu Oct 10 11:56:44 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 466D2AFD;
 Thu, 10 Oct 2013 11:56:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3354A250A;
 Thu, 10 Oct 2013 11:56:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ABuiqd087040;
 Thu, 10 Oct 2013 11:56:44 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ABuiM4087039;
 Thu, 10 Oct 2013 11:56:44 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201310101156.r9ABuiM4087039@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 10 Oct 2013 11:56:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r256264 - stable/9/etc/rc.d
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Oct 2013 11:56:44 -0000

Author: gjb
Date: Thu Oct 10 11:56:43 2013
New Revision: 256264
URL: http://svnweb.freebsd.org/changeset/base/256264

Log:
  Fix mismerge introduced in r256230, adding auditdistd back to
  etc/rc.d/Makefile.
  
  Submitted by:	Herbert J. Skuhra
  Pointyhat to:	gjb

Modified:
  stable/9/etc/rc.d/Makefile

Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile	Thu Oct 10 11:51:11 2013	(r256263)
+++ stable/9/etc/rc.d/Makefile	Thu Oct 10 11:56:43 2013	(r256264)
@@ -19,6 +19,7 @@ FILES=	DAEMON \
 	atm2 \
 	atm3 \
 	auditd \
+	auditdistd \
 	bgfsck \
 	${_bluetooth} \
 	bootparams \