[Rt-commit] r7887 - rt/branches/3.6-RELEASE/lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Wed May 16 13:19:55 2007
New Revision: 7887

Modified:
   rt/branches/3.6-RELEASE/lib/RT/ACE_Overlay.pm

Log:
* we get principal's type as argument, but that's really
  wrong as we have id of the pricipal and each principal
  record has type property. Use info from the record and
  log an error.

Modified: rt/branches/3.6-RELEASE/lib/RT/ACE_Overlay.pm
==============================================================================
--- rt/branches/3.6-RELEASE/lib/RT/ACE_Overlay.pm	(original)
+++ rt/branches/3.6-RELEASE/lib/RT/ACE_Overlay.pm	Wed May 16 13:19:55 2007
@@ -911,6 +911,15 @@
         return ( $princ_obj, undef );
     }
 
+    $princ_type ||= $princ_obj->PrincipalType;
+    unless ( $princ_type eq $princ_obj->PrincipalType ) {
+        $RT::Logger->error(
+            "Principal #$princ_id has type ". $princ_obj->PrincipalType
+            . " when caller says '$princ_type'"
+        );
+        $princ_type = $princ_obj->PrincipalType;
+    }
+
     # Rights never get granted to users. they get granted to their 
     # ACL equivalence groups
     if ( $princ_type eq 'User' ) {