launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/packaging.bug-1066935 into lp:~maas-maintainers/maas/packaging.quantal.

Commit message:
Fix permissions and group ownership of file /etc/bind/maas/named.conf.rndc.maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1066935 in maas (Ubuntu): "named.conf.rndc.maas is insecure by default"
  https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1066935

For more details, see:
https://code.launchpad.net/~rvb/maas/packaging.bug-1066935/+merge/130584
-- 
https://code.launchpad.net/~rvb/maas/packaging.bug-1066935/+merge/130584
Your team MAAS Maintainers is requested to review the proposed merge of lp:~rvb/maas/packaging.bug-1066935 into lp:~maas-maintainers/maas/packaging.quantal.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-18 00:13:26 +0000
+++ debian/changelog	2012-10-19 15:46:23 +0000
@@ -1,6 +1,8 @@
 maas (0.1+bzr1269+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
-  * UNRELEASED
+  [ Raphaël Badin ]
+  * debian/maas-dns.postinst: fix permissions and group ownership of
+    file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935)
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 17 Oct 2012 20:12:59 -0400
 

=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2012-10-16 12:25:40 +0000
+++ debian/maas-dns.postinst	2012-10-19 15:46:23 +0000
@@ -6,7 +6,7 @@
         maas set_up_dns
     fi
 
-    # fix permissions
+    # Fix permissions.
     if [ -d /etc/bind/maas ]; then
         chown -R maas:root /etc/bind/maas
     fi
@@ -16,8 +16,12 @@
     if [ -f /etc/bind/maas/rndc.conf.maas ]; then
         chmod 600 /etc/bind/maas/rndc.conf.maas
     fi
+    if [ -f /etc/bind/maas/named.conf.rndc.maas ]; then
+        chown maas:bind /etc/bind/maas/named.conf.rndc.maas
+        chmod 640 /etc/bind/maas/named.conf.rndc.maas
+    fi
 
-    # remove any existing MAAS-related include line from
+    # Remove any existing MAAS-related include line from
     # /etc/bind/named.conf.local, then re-add it.
     sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
     maas get_named_conf --edit --config_path /etc/bind/named.conf.local