From 85aca891e71bb3aa55eb581178492a413f4d7203 Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 26 Sep 2004 07:01:56 +0000
Subject: [PATCH] It's not necessary to create an rndc.key file if the user
 already has an rndc.conf file.

Submitted by:	Sergey Mokryshev <mokr@mokr.net>
---
 etc/rc.d/named | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/rc.d/named b/etc/rc.d/named
index 89ea482eb2c..c915afd1083 100755
--- a/etc/rc.d/named
+++ b/etc/rc.d/named
@@ -71,7 +71,8 @@ named_precmd()
 	fi
 
 	# Create an rndc.key file for the user if none exists
-	if [ ! -f "${named_chrootdir}/etc/namedb/rndc.key" ]; then
+	if [ ! -f "${named_chrootdir}/etc/namedb/rndc.key" -a \
+	    ! -f "${named_chrootdir}/etc/namedb/rndc.conf" ]; then
 		rndc-confgen -a -b256 ${confgen_chroot}
 	fi
 }