From owner-cvs-src-old@FreeBSD.ORG Wed Apr 28 22:47:45 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD00B106566C for ; Wed, 28 Apr 2010 22:47:45 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ABA148FC17 for ; Wed, 28 Apr 2010 22:47:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3SMlj2u091163 for ; Wed, 28 Apr 2010 22:47:45 GMT (envelope-from dougb@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3SMlj6h091162 for cvs-src-old@freebsd.org; Wed, 28 Apr 2010 22:47:45 GMT (envelope-from dougb@repoman.freebsd.org) Message-Id: <201004282247.o3SMlj6h091162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to dougb@repoman.freebsd.org using -f From: Doug Barton Date: Wed, 28 Apr 2010 22:29:17 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/etc/rc.d named X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Apr 2010 22:47:45 -0000 dougb 2010-04-28 22:29:17 UTC FreeBSD src repository Modified files: etc/rc.d named Log: SVN rev 207346 on 2010-04-28 22:29:17Z by dougb In the case where named_chroot_autoupdate is NOT set, but named_chrootdir IS set, named-checkconf fails because it cannot find the conf file. Fix this by making checkconf a variable that includes "-t $named_chrootdir" as needed. Notice of the bug and suggested direction for the fix from [1]. Using required_files for named.conf is overkill ever since I added the named-checkconf call, so rather than update the logic to handle the case described above, remove it. This also handles the case where named_chroot_autoupdate IS set but the symlink doesn't exist yet. PR: conf/145904 Submitted by: J R Matthews Revision Changes Path 1.35 +10 -4 src/etc/rc.d/named