Merge lp:~barry/ubuntu/natty/fuse/bug-697792 into lp:ubuntu/natty/fuse

[Barry Warsaw]

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-19 14:31:21 +0000
+++ debian/changelog	2011-01-21 19:09:13 +0000
@@ -1,3 +1,12 @@
+fuse (2.8.4-1.1ubuntu3) natty; urgency=low
+
+  * debian/fuse-utils.postinst:
+    Respect local modifications to /etc/fuse.conf by not changing the
+    ownership or mode of /etc/fuse.conf in the postinst file unless we're
+    also adding the fuse group for the first time. (LP: #697792)
+
+ -- Barry Warsaw <[e-mail]>  Fri, 21 Jan 2011 11:13:06 -0500
+
 fuse (2.8.4-1.1ubuntu2) natty; urgency=low
 
   * SECURITY UPDATE: arbitrary unprivileged unmount (LP: #670622)

=== modified file 'debian/fuse-utils.postinst'
--- debian/fuse-utils.postinst	2010-01-13 14:48:39 +0000
+++ debian/fuse-utils.postinst	2011-01-21 19:09:13 +0000
@@ -6,9 +6,15 @@
 case "$1" in
   configure|upgrade)
   
-  # Create fuse group
-  echo "creating fuse group..."
-  getent group fuse >/dev/null || addgroup --system fuse
+  # Create fuse group.  If the group does not exist, then it's also highly
+  # unlikely that /etc/fuse.conf exists with local modifications, so only in
+  # this case do we set the ownership of that file.  LP: #679792
+  if ! getent group fuse >/dev/null; then
+    echo "creating fuse group and modifying ownership of /etc/fuse.conf..."
+    addgroup --system fuse
+    chmod 0640 /etc/fuse.conf
+    chown root:fuse /etc/fuse.conf
+  fi
  
   # Detect if udev is active
   udev=0
@@ -45,8 +51,9 @@
 
   test -f /etc/default/fuse-utils && rm -f /etc/default/fuse-utils
   
-  chown root:fuse /etc/fuse.conf
-  chmod 0640 /etc/fuse.conf
+  # LP: #697792
+  #chown root:fuse /etc/fuse.conf
+  #chmod 0640 /etc/fuse.conf
 
   if ! grep -qw fuse /proc/filesystems; then
     # try to load the module