--- rpms/smeserver-mailsorting/contribs8/smeserver-mailsorting-1.2-admin-account.patch	2013/11/28 05:42:37	1.1
+++ rpms/smeserver-mailsorting/contribs8/smeserver-mailsorting-1.2-admin-account.patch	2013/11/29 21:35:17	1.2
@@ -19,7 +19,7 @@ diff -Nur smeserver-mailsorting-1.2-old/
      die
  	"Account $userName is not a user account; update mailsorting failed.\n"
 -	unless ($user && $user->prop('type') eq "user");
-+	unless ($user && $user->prop('type') eq "user" || "admin");
++	unless ($user && $user->prop('type') eq "user" || $userName eq "admin");
      @users = ($user);
      if($user->prop('geekmode') eq "enabled"){
          print "User $userName in geek mode, do not update mailfilter and procmail rules.\n";
@@ -50,7 +50,7 @@ diff -Nur smeserver-mailsorting-1.2-old/
          "Account $USERNAME is not a user account; "
          . "update email forwarding failed.\n"
 -            unless $type eq 'user';
-+            unless $type eq 'user' || 'admin';
++            unless $type eq 'user' ||  $USERNAME eq 'admin';
  
      my %processmail;
      tie %processmail, 'esmith::config', '/home/e-smith/db/processmail';
@@ -69,7 +69,7 @@ diff -Nur smeserver-mailsorting-1.2-old/
          "Account $USERNAME is not a user account; "
          . "update email forwarding failed.\n"
 -            unless $type eq 'user';
-+            unless $type eq 'user' || 'admin';
++            unless $type eq 'user' ||  $USERNAME eq 'admin';
  
      my %processmail;
      tie %processmail, 'esmith::config', '/home/e-smith/db/processmail';
@@ -88,7 +88,7 @@ diff -Nur smeserver-mailsorting-1.2-old/
          "Account $USERNAME is not a user account; "
          . "update email forwarding failed.\n"
 -            unless $type eq 'user';
-+            unless $type eq 'user' || 'admin';
++            unless $type eq 'user' || $USERNAME eq 'admin';
  
      my %processmail;
      tie %processmail, 'esmith::config', '/home/e-smith/db/processmail';