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
=== modified file 'debian/changelog'
--- debian/changelog 2011-03-25 14:36:33 +0000
+++ debian/changelog 2011-04-13 22:37:25 +0000
@@ -1,3 +1,16 @@
1vsftpd (2.2.2-3ubuntu6.2) lucid-proposed; urgency=low
2
3 * debian/vsftpd.upstart:
4 - Fix typo. Thanks to Jürgen Kreileder (LP: #577165)
5 - Fix start of vsftpd even if not in standalone mode. Thanks to
6 Stephane Chazelas (LP: #648202)
7
8 [ Dustin Kirkland, Serge Hallyn ]
9 * debian/vsftpd.postinst: Check that the group exists first, then the user,
10 then try adding the user to the group. (LP: #629234, LP: #677764)
11
12 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 13 Apr 2011 18:34:25 -0400
13
1vsftpd (2.2.2-3ubuntu6.1) lucid-security; urgency=low14vsftpd (2.2.2-3ubuntu6.1) lucid-security; urgency=low
215
3 * SECURITY UPDATE: denial of service via crafted glob expressions16 * SECURITY UPDATE: denial of service via crafted glob expressions
417
=== modified file 'debian/vsftpd.postinst'
--- debian/vsftpd.postinst 2011-03-25 14:36:33 +0000
+++ debian/vsftpd.postinst 2011-04-13 22:37:25 +0000
@@ -16,16 +16,19 @@
1616
17 db_stop17 db_stop
1818
19 if ! getent passwd | grep -q "^${_USERNAME}"19 if ! getent group | grep -q "^${_USERNAME}:"
20 then
21 addgroup --system --quiet ${_USERNAME}
22 else
23 echo "vsftpd group (${_USERNAME}) already exists, doing nothing."
24 fi
25 if ! getent passwd | grep -q "^${_USERNAME}:"
20 then26 then
21 adduser --system --home ${_DIRECTORY} --no-create-home --quiet --gecos 'ftp daemon' --group ${_USERNAME}27 adduser --system --home ${_DIRECTORY} --no-create-home --quiet --gecos 'ftp daemon' --group ${_USERNAME}
22 elif ! getent group | grep -q "^${_USERNAME}"
23 then
24 addgroup --system --quiet ${_USERNAME}
25 gpasswd -a ${_USERNAME} ${_USERNAME}
26 else28 else
27 echo "vsftpd user (${_USERNAME}) already exists, doing nothing."29 echo "vsftpd user (${_USERNAME}) already exists, doing nothing."
28 fi30 fi
31 gpasswd -a ${_USERNAME} ${_USERNAME}
2932
30 if [ ! -d "${_DIRECTORY}" ]33 if [ ! -d "${_DIRECTORY}" ]
31 then34 then
3235
=== modified file 'debian/vsftpd.upstart'
--- debian/vsftpd.upstart 2011-03-25 14:36:33 +0000
+++ debian/vsftpd.upstart 2011-04-13 22:37:25 +0000
@@ -15,15 +15,15 @@
15 # Return 1 if vsftpd.conf doesn't have listen yes or listen_ipv6=yes15 # Return 1 if vsftpd.conf doesn't have listen yes or listen_ipv6=yes
16 CONFFILE="/etc/vsftpd.conf"16 CONFFILE="/etc/vsftpd.conf"
1717
18 if [ -e "${CONFFILE}" ] && !egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}"18 if [ -e "${CONFFILE}" ] && ! egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}"
19 then19 then
20 echo "${CONFFILE}: listen disabled - service will not start"20 echo "${CONFFILE}: listen disabled - service will not start"
21 return 121 return 1
22 fi 22 fi
23 }23 }
24 [ -d /var/run/vsftpd ] || install -m 755 -o root -g root -d /var/run/vsftpd24 [ -d /var/run/vsftpd ] || install -m 755 -o root -g root -d /var/run/vsftpd
25 [ -d /var/run/vsftpd/emply ] || install -m 755 -o root -g root -d /var/run/vsftpd/empty25 [ -d /var/run/vsftpd/empty ] || install -m 755 -o root -g root -d /var/run/vsftpd/empty
26 check_standalone_mode || exit 026 check_standalone_mode || stop
27end script27end script
2828
29exec /usr/sbin/vsftpd29exec /usr/sbin/vsftpd

Subscribers

People subscribed via source and target branches