From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 2 Jun 2010 16:52:04 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~339
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/251480b566f6ab73f5546bb3fd303ccae9701d6e?ds=inline;hp=-c

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

251480b566f6ab73f5546bb3fd303ccae9701d6e
diff --combined SL/Auth.pm
index 10855e25b,72e36978f..e7f8f7bee
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@@ -1,13 -1,18 +1,13 @@@
  package SL::Auth;
  
 -use constant OK              =>   0;
 -use constant ERR_PASSWORD    =>   1;
 -use constant ERR_BACKEND     => 100;
 -
 -use constant SESSION_OK      =>   0;
 -use constant SESSION_NONE    =>   1;
 -use constant SESSION_EXPIRED =>   2;
 +use DBI;
  
  use Digest::MD5 qw(md5_hex);
  use IO::File;
  use Time::HiRes qw(gettimeofday);
  use List::MoreUtils qw(uniq);
  
 +use SL::Auth::Constants qw(:all);
  use SL::Auth::DB;
  use SL::Auth::LDAP;
  
@@@ -824,7 -829,7 +824,7 @@@ sub evaluate_rights_ary 
      }
    }
  
-   $main::lxdebug->enter_sub(2);
+   $main::lxdebug->leave_sub(2);
  
    return $value;
  }
@@@ -858,7 -863,7 +858,7 @@@ sub _parse_rights_string 
        pop @stack;
  
        if (!@stack) {
-         $main::lxdebug->enter_sub(2);
+         $main::lxdebug->leave_sub(2);
          return 0;
        }
  
@@@ -874,7 -879,7 +874,7 @@@
  
    my $result = ($access || (1 < scalar @stack)) ? 0 : evaluate_rights_ary($stack[0]);
  
-   $main::lxdebug->enter_sub(2);
+   $main::lxdebug->leave_sub(2);
  
    return $result;
  }