diff -Nru adduser-3.110ubuntu3/debian/changelog adduser-3.110ubuntu4/debian/changelog --- adduser-3.110ubuntu3/debian/changelog 2009-03-19 11:51:02.000000000 -0500 +++ adduser-3.110ubuntu4/debian/changelog 2009-03-24 13:55:02.000000000 -0500 @@ -1,3 +1,10 @@ +adduser (3.110ubuntu4) jaunty; urgency=low + + * deluser: remove all of /var/lib/ecryptfs/$user, if deluser --remove-home + is specified, LP: #347970 + + -- Dustin Kirkland Tue, 24 Mar 2009 13:54:50 -0500 + adduser (3.110ubuntu3) jaunty; urgency=low * Fix the default username regexp to allow underscores. LP: #341698. diff -Nru adduser-3.110ubuntu3/deluser adduser-3.110ubuntu4/deluser --- adduser-3.110ubuntu3/deluser 2008-11-04 20:22:10.000000000 -0600 +++ adduser-3.110ubuntu4/deluser 2009-03-24 13:54:37.000000000 -0500 @@ -268,9 +268,11 @@ } foreach my $re ( split ' ', $config{"no_del_paths"} ) { if( $File::Find::name =~ qr/$re/ ) { - s_printf (gtx("Not backing up/removing `%s', it matches %s.\n"),$File::Find::name,$re); - $File::Find::prune=1; - return; + if ( $File::Find::name !~ /^\/var\/lib\/ecryptfs\/$user/ ) { + s_printf (gtx("Not backing up/removing `%s', it matches %s.\n"),$File::Find::name,$re); + $File::Find::prune=1; + return; + } } } @@ -280,6 +282,8 @@ if(-d $File::Find::name); } # sub home_match + File::Find::find({wanted => \&home_match, untaint => 1, no_chdir => 1}, "/var/lib/ecryptfs/$user") + if(-d "/var/lib/ecryptfs/$user"); File::Find::find({wanted => \&home_match, untaint => 1, no_chdir => 1}, $pw_homedir) if(-d "$pw_homedir"); push(@files, "/var/mail/$user")