Attachment 598934 Details for Bug 841316 – Patch that should fix the described problem

[patch] Patch that should fix the described problem

named.patch (text/plain), 1.24 KB, created by Timothy on 2012-07-18 16:34:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy

Created: 2012-07-18 16:34:18 UTC

Size: 1.24 KB

patch

obsolete

>--- /etc/init.d/named-orig	2012-07-18 18:05:49.484659911 +0200
>+++ /etc/init.d/named	2012-07-18 18:13:23.179673153 +0200
>@@ -106,18 +106,23 @@ start()
> 
>   [ -x /usr/sbin/"$named" ] || exit 5
> 
>-  if [ ! -s /etc/rndc.key ]; then
>-    # Generate rndc.key if doesn't exist
>-    echo -n $"Generating /etc/rndc.key:"
>-    if /usr/sbin/rndc-confgen -a > /dev/null 2>&1; then
>-      chmod 640 /etc/rndc.key
>-      chown root.named /etc/rndc.key
>-      [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.key
>-      success $"/etc/rndc.key generation"
>-      echo
>-    else
>-      failure $"/etc/rndc.key generation"
>-      echo
>+
>+  if [ -e /etc/rndc.conf ]; then
>+    RNDCKEY_PATH=`grep include /etc/rndc.conf | grep rndc | cut -d '"' -f2`
>+    echo "rndc.key is located in $RNDCKEY_PATH"
>+    if [ ! -s $RNDCKEY_PATH ]; then
>+      # Generate rndc.key if doesn't exist
>+      echo -n $"Generating $RNDCKEY_PATH:"
>+      if /usr/sbin/rndc-confgen -a > /dev/null 2>&1; then
>+        chmod 640 $RNDCKEY_PATH
>+        chown root.named $RNDCKEY_PATH
>+        [ -x /sbin/restorecon ] && /sbin/restorecon $RNDCKEY_PATH
>+        success $"$RNDCKEY_PATH generation"
>+        echo
>+      else
>+        failure $"$RNDCKEY_PATH generation"
>+        echo
>+      fi
>     fi
>   fi
>

Actions: View | Diff

Attachments on bug 841316: 598934 | 732640