added NET_2_0 strongly typed overrides

[mono.git] / mcs / class / corlib / System.Security.Principal / GenericPrincipal.cs

diff --git a/mcs/class/corlib/System.Security.Principal/GenericPrincipal.cs b/mcs/class/corlib/System.Security.Principal/GenericPrincipal.cs
index 491ee487b13f055dc73051cbc177a21e712cff3a..15d12cc351189790ea79089f066c2389746168df 100644 (file)
--- a/mcs/class/corlib/System.Security.Principal/GenericPrincipal.cs
+++ b/mcs/class/corlib/System.Security.Principal/GenericPrincipal.cs
@@ -1,14 +1,12 @@
 //
 // System.Security.Principal.GenericPrincipal.cs
 //
-// Author:
-//   Miguel de Icaza (miguel@ximian.com)
+// Authors:
+//     Miguel de Icaza (miguel@ximian.com)
+//     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) Ximian, Inc.  http://www.ximian.com
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -30,40 +28,50 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using System.Runtime.InteropServices;
+
 namespace System.Security.Principal {
 
        [Serializable]
+#if NET_2_0
+       [ComVisible (true)]
+#endif
        public class GenericPrincipal : IPrincipal {
-               IIdentity identity;
-               string [] roles;
+
+               // field names are serialization compatible with .net
+               private IIdentity m_identity;
+               private string[] m_roles;
                
                public GenericPrincipal (IIdentity identity, string [] roles)
                {
                        if (identity == null)
                                throw new ArgumentNullException ("identity");
 
-                       this.identity = identity;
+                       m_identity = identity;
                        if (roles != null) {
                                // make our own (unchangeable) copy of the roles
-                               this.roles = new string [roles.Length];
+                               m_roles = new string [roles.Length];
                                for (int i=0; i < roles.Length; i++)
-                                       this.roles [i] = roles [i];
+                                       m_roles [i] = roles [i];
                        }
                }
 
                public virtual IIdentity Identity {
-                       get { return identity; }
+                       get { return m_identity; }
                }
 
                public virtual bool IsInRole (string role)
                {
-                       if (roles == null)
+                       if (m_roles == null)
                                return false;
 
-                       foreach (string r in roles)
-                               if (role == r)
-                                       return true;
-
+                       int l = role.Length;
+                       foreach (string r in m_roles) {
+                               if ((r != null) && (l == r.Length)) {
+                                       if (String.Compare (role, 0, r, 0, l, true) == 0)
+                                               return true;
+                               }
+                       }
                        return false;
                }
        }