/[smecontribs]/rpms/smeserver-mailsorting/contribs8/smeserver-mailsorting-1.2-admin-account.patch
ViewVC logotype

Diff of /rpms/smeserver-mailsorting/contribs8/smeserver-mailsorting-1.2-admin-account.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by unnilennium, Thu Nov 28 05:42:37 2013 UTC Revision 1.2 by unnilennium, Fri Nov 29 21:35:17 2013 UTC
# Line 19  diff -Nur smeserver-mailsorting-1.2-old/ Line 19  diff -Nur smeserver-mailsorting-1.2-old/
19       die       die
20          "Account $userName is not a user account; update mailsorting failed.\n"          "Account $userName is not a user account; update mailsorting failed.\n"
21  -       unless ($user && $user->prop('type') eq "user");  -       unless ($user && $user->prop('type') eq "user");
22  +       unless ($user && $user->prop('type') eq "user" || "admin");  +       unless ($user && $user->prop('type') eq "user" || $userName eq "admin");
23       @users = ($user);       @users = ($user);
24       if($user->prop('geekmode') eq "enabled"){       if($user->prop('geekmode') eq "enabled"){
25           print "User $userName in geek mode, do not update mailfilter and procmail rules.\n";           print "User $userName in geek mode, do not update mailfilter and procmail rules.\n";
# Line 50  diff -Nur smeserver-mailsorting-1.2-old/ Line 50  diff -Nur smeserver-mailsorting-1.2-old/
50           "Account $USERNAME is not a user account; "           "Account $USERNAME is not a user account; "
51           . "update email forwarding failed.\n"           . "update email forwarding failed.\n"
52  -            unless $type eq 'user';  -            unless $type eq 'user';
53  +            unless $type eq 'user' || 'admin';  +            unless $type eq 'user' ||  $USERNAME eq 'admin';
54    
55       my %processmail;       my %processmail;
56       tie %processmail, 'esmith::config', '/home/e-smith/db/processmail';       tie %processmail, 'esmith::config', '/home/e-smith/db/processmail';
# Line 69  diff -Nur smeserver-mailsorting-1.2-old/ Line 69  diff -Nur smeserver-mailsorting-1.2-old/
69           "Account $USERNAME is not a user account; "           "Account $USERNAME is not a user account; "
70           . "update email forwarding failed.\n"           . "update email forwarding failed.\n"
71  -            unless $type eq 'user';  -            unless $type eq 'user';
72  +            unless $type eq 'user' || 'admin';  +            unless $type eq 'user' ||  $USERNAME eq 'admin';
73    
74       my %processmail;       my %processmail;
75       tie %processmail, 'esmith::config', '/home/e-smith/db/processmail';       tie %processmail, 'esmith::config', '/home/e-smith/db/processmail';
# Line 88  diff -Nur smeserver-mailsorting-1.2-old/ Line 88  diff -Nur smeserver-mailsorting-1.2-old/
88           "Account $USERNAME is not a user account; "           "Account $USERNAME is not a user account; "
89           . "update email forwarding failed.\n"           . "update email forwarding failed.\n"
90  -            unless $type eq 'user';  -            unless $type eq 'user';
91  +            unless $type eq 'user' || 'admin';  +            unless $type eq 'user' || $USERNAME eq 'admin';
92    
93       my %processmail;       my %processmail;
94       tie %processmail, 'esmith::config', '/home/e-smith/db/processmail';       tie %processmail, 'esmith::config', '/home/e-smith/db/processmail';

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed