Merge lp:~andreserl/ubuntu/lucid/vsftpd/sru1 into lp:ubuntu/lucid-updates/vsftpd

Proposed by Andres Rodriguez
Status: Needs review
Proposed branch: lp:~andreserl/ubuntu/lucid/vsftpd/sru1
Merge into: lp:ubuntu/lucid-updates/vsftpd
Diff against target: 72 lines (+24/-8)
3 files modified
debian/changelog (+13/-0)
debian/vsftpd.postinst (+8/-5)
debian/vsftpd.upstart (+3/-3)
To merge this branch: bzr merge lp:~andreserl/ubuntu/lucid/vsftpd/sru1
Reviewer Review Type Date Requested Status
Dave Walker (community) Approve
Review via email: mp+57608@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

lgtm, even though there seems to be quite a few bug fixes in this upload. Uploading, but not merging - awaiting response of SRU team review.

Thanks.

review: Approve

Unmerged revisions

29. By Andres Rodriguez on 2011-04-13

* debian/vsftpd.upstart:
  - Fix typo. Thanks to Jürgen Kreileder (LP: #577165)
  - Fix start of vsftpd even if not in standalone mode. Thanks to
    Stephane Chazelas (LP: #648202)
* debian/vsftpd.postinst: Check that the group exists first, then the user,
  then try adding the user to the group. (LP: #629234, LP: #677764)

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 2011-03-25 14:36:33 +0000
3+++ debian/changelog 2011-04-13 22:37:25 +0000
4@@ -1,3 +1,16 @@
5+vsftpd (2.2.2-3ubuntu6.2) lucid-proposed; urgency=low
6+
7+ * debian/vsftpd.upstart:
8+ - Fix typo. Thanks to Jürgen Kreileder (LP: #577165)
9+ - Fix start of vsftpd even if not in standalone mode. Thanks to
10+ Stephane Chazelas (LP: #648202)
11+
12+ [ Dustin Kirkland, Serge Hallyn ]
13+ * debian/vsftpd.postinst: Check that the group exists first, then the user,
14+ then try adding the user to the group. (LP: #629234, LP: #677764)
15+
16+ -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 13 Apr 2011 18:34:25 -0400
17+
18 vsftpd (2.2.2-3ubuntu6.1) lucid-security; urgency=low
19
20 * SECURITY UPDATE: denial of service via crafted glob expressions
21
22=== modified file 'debian/vsftpd.postinst'
23--- debian/vsftpd.postinst 2011-03-25 14:36:33 +0000
24+++ debian/vsftpd.postinst 2011-04-13 22:37:25 +0000
25@@ -16,16 +16,19 @@
26
27 db_stop
28
29- if ! getent passwd | grep -q "^${_USERNAME}"
30+ if ! getent group | grep -q "^${_USERNAME}:"
31+ then
32+ addgroup --system --quiet ${_USERNAME}
33+ else
34+ echo "vsftpd group (${_USERNAME}) already exists, doing nothing."
35+ fi
36+ if ! getent passwd | grep -q "^${_USERNAME}:"
37 then
38 adduser --system --home ${_DIRECTORY} --no-create-home --quiet --gecos 'ftp daemon' --group ${_USERNAME}
39- elif ! getent group | grep -q "^${_USERNAME}"
40- then
41- addgroup --system --quiet ${_USERNAME}
42- gpasswd -a ${_USERNAME} ${_USERNAME}
43 else
44 echo "vsftpd user (${_USERNAME}) already exists, doing nothing."
45 fi
46+ gpasswd -a ${_USERNAME} ${_USERNAME}
47
48 if [ ! -d "${_DIRECTORY}" ]
49 then
50
51=== modified file 'debian/vsftpd.upstart'
52--- debian/vsftpd.upstart 2011-03-25 14:36:33 +0000
53+++ debian/vsftpd.upstart 2011-04-13 22:37:25 +0000
54@@ -15,15 +15,15 @@
55 # Return 1 if vsftpd.conf doesn't have listen yes or listen_ipv6=yes
56 CONFFILE="/etc/vsftpd.conf"
57
58- if [ -e "${CONFFILE}" ] && !egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}"
59+ if [ -e "${CONFFILE}" ] && ! egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}"
60 then
61 echo "${CONFFILE}: listen disabled - service will not start"
62 return 1
63 fi
64 }
65 [ -d /var/run/vsftpd ] || install -m 755 -o root -g root -d /var/run/vsftpd
66- [ -d /var/run/vsftpd/emply ] || install -m 755 -o root -g root -d /var/run/vsftpd/empty
67- check_standalone_mode || exit 0
68+ [ -d /var/run/vsftpd/empty ] || install -m 755 -o root -g root -d /var/run/vsftpd/empty
69+ check_standalone_mode || stop
70 end script
71
72 exec /usr/sbin/vsftpd

Subscribers

People subscribed via source and target branches