From: <mn...@us...> - 2007-12-13 17:15:42
|
Revision: 32 http://panda-admin.svn.sourceforge.net/panda-admin/?rev=32&view=rev Author: mnencia Date: 2007-12-13 09:15:39 -0800 (Thu, 13 Dec 2007) Log Message: ----------- Mark the user of a moved directory as found. Modified Paths: -------------- trunk/setup/bin/vmaild Modified: trunk/setup/bin/vmaild =================================================================== --- trunk/setup/bin/vmaild 2007-12-13 17:05:41 UTC (rev 31) +++ trunk/setup/bin/vmaild 2007-12-13 17:15:39 UTC (rev 32) @@ -412,8 +412,6 @@ my $user = $maildir; $user =~ s%^.*/([^/]+)/?$%$1%; if ( $users{$user} ) { - $users{$user}->{found} = 1; - $users{$user}->{sieveok} = check_sieve($maildir); my $dbmaildir = "$domaindir/$users{$user}->{maildir}"; $dbmaildir =~ s%/$%%; if ($dbmaildir ne $maildir ) { @@ -426,12 +424,21 @@ else { logmsg( 'notice', "incongruence in home location found for user: $user\@$domain" ); if (sys_or_log("mv $maildir $dbmaildir")) { + $maildir = $dbmaildir; + $users{$user}->{found} = 1; + $users{$user}->{sieveok} = check_sieve($maildir); + } + else { my $deldate = POSIX::strftime( "%F-%H%M%S", gmtime ); sys_or_log("mv $maildir $deldir/${domain}_${user}_$deldate") or $ok = 0; } } } + else { + $users{$user}->{found} = 1; + $users{$user}->{sieveok} = check_sieve($maildir); + } } else { logmsg( 'notice', "invalid or deleted user: $user\@$domain " ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |