diff -u vsftpd-2.2.2/debian/changelog vsftpd-2.2.2/debian/changelog --- vsftpd-2.2.2/debian/changelog +++ vsftpd-2.2.2/debian/changelog @@ -1,3 +1,10 @@ +vsftpd (2.2.2-3ubuntu7.1) lucid-proposed; urgency=low + + * debian/vsftpd.postinst: Check that the group exists first, then + the user, then try adding the user to the group, LP: #629234 + + -- Dustin Kirkland Fri, 03 Sep 2010 08:24:33 -0600 + vsftpd (2.2.2-3ubuntu6) lucid; urgency=low * debian/vsftpd.upstart: Update upstart job. (LP: #563973) diff -u vsftpd-2.2.2/debian/vsftpd.postinst vsftpd-2.2.2/debian/vsftpd.postinst --- vsftpd-2.2.2/debian/vsftpd.postinst +++ vsftpd-2.2.2/debian/vsftpd.postinst @@ -16,16 +16,19 @@ db_stop + if ! getent group | grep -q "^${_USERNAME}" + then + addgroup --system --quiet ${_USERNAME} + else + echo "vsftpd group (${_USERNAME}) already exists, doing nothing." + fi if ! getent passwd | grep -q "^${_USERNAME}" then adduser --system --home ${_DIRECTORY} --no-create-home --quiet --gecos 'ftp daemon' --group ${_USERNAME} - elif ! getent group | grep -q "^${_USERNAME}" - then - addgroup --system --quiet ${_USERNAME} - gpasswd -a ${_USERNAME} ${_USERNAME} else echo "vsftpd user (${_USERNAME}) already exists, doing nothing." fi + gpasswd -a ${_USERNAME} ${_USERNAME} if [ ! -d "${_DIRECTORY}" ] then