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

Proposed by Barry Warsaw
Status: Merged
Merge reported by: Barry Warsaw
Merged at revision: not available
Proposed branch: lp:~barry/ubuntu/lucid/fuse/bug-697792
Merge into: lp:ubuntu/lucid/fuse
Diff against target: 51 lines (+21/-5)
2 files modified
debian/changelog (+9/-0)
debian/fuse-utils.postinst (+12/-5)
To merge this branch: bzr merge lp:~barry/ubuntu/lucid/fuse/bug-697792
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+47283@code.launchpad.net

Description of the change

Backport of Natty fix for lucid-proposed.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-01-25 17:10:52 +0000
3+++ debian/changelog 2011-01-24 18:14:09 +0000
4@@ -1,3 +1,12 @@
5+fuse (2.8.1-1.1ubuntu3) lucid-proposed; urgency=low
6+
7+ * debian/fuse-utils.postinst:
8+ Respect local modifications to /etc/fuse.conf by not changing the
9+ ownership or mode of /etc/fuse.conf in the postinst file unless we're
10+ also adding the fuse group for the first time. (LP: #697792)
11+
12+ -- Barry Warsaw <barry@ubuntu.com> Mon, 24 Jan 2011 11:25:19 -0500
13+
14 fuse (2.8.1-1.1ubuntu2) lucid; urgency=low
15
16 * SECURITY UPDATE: local attacker can trick fuse into unmounting a
17
18=== modified file 'debian/fuse-utils.postinst'
19--- debian/fuse-utils.postinst 2010-01-13 14:48:39 +0000
20+++ debian/fuse-utils.postinst 2011-01-24 18:14:09 +0000
21@@ -6,9 +6,15 @@
22 case "$1" in
23 configure|upgrade)
24
25- # Create fuse group
26- echo "creating fuse group..."
27- getent group fuse >/dev/null || addgroup --system fuse
28+ # Create fuse group. If the group does not exist, then it's also highly
29+ # unlikely that /etc/fuse.conf exists with local modifications, so only in
30+ # this case do we set the ownership of that file. LP: #679792
31+ if ! getent group fuse >/dev/null; then
32+ echo "creating fuse group and modifying ownership of /etc/fuse.conf..."
33+ addgroup --system fuse
34+ chmod 0640 /etc/fuse.conf
35+ chown root:fuse /etc/fuse.conf
36+ fi
37
38 # Detect if udev is active
39 udev=0
40@@ -45,8 +51,9 @@
41
42 test -f /etc/default/fuse-utils && rm -f /etc/default/fuse-utils
43
44- chown root:fuse /etc/fuse.conf
45- chmod 0640 /etc/fuse.conf
46+ # LP: #697792
47+ #chown root:fuse /etc/fuse.conf
48+ #chmod 0640 /etc/fuse.conf
49
50 if ! grep -qw fuse /proc/filesystems; then
51 # try to load the module

Subscribers

People subscribed via source and target branches

to all changes: