merge r98600

[mono.git] / mcs / class / System.Data / System.Data.Odbc / OdbcPermissionAttribute.cs

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcPermissionAttribute.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcPermissionAttribute.cs
index a764d320179064f9608437675715e75bceeed99f..cf412a1756c3df8f614bc75a81192647f6f34d1e 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcPermissionAttribute.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcPermissionAttribute.cs
@@ -1,30 +1,47 @@
 //
 // System.Data.Odbc.OdbcPermissionAttribute
 //
-// Author:
-//   Umadevi S (sumadevi@novell.com)
+// Authors:
+//     Umadevi S (sumadevi@novell.com)
+//     Sebastien Pouliot  <sebastien@ximian.com>
 //
-// Copyright (C) Novell Inc 2004
+// Copyright (C) 2004 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System.Data;
 using System.Data.Common;
 using System.Security;
 using System.Security.Permissions;
 
-namespace System.Data.Odbc
-{
+namespace System.Data.Odbc {
+
        [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | 
                        AttributeTargets.Struct | AttributeTargets.Constructor |
                        AttributeTargets.Method, AllowMultiple=true,
                        Inherited=false)]
        [Serializable]
-       public sealed class OdbcPermissionAttribute : DBDataPermissionAttribute
-       {
+       public sealed class OdbcPermissionAttribute : DBDataPermissionAttribute {
 
                #region Constructors 
 
-               [MonoTODO]
                public OdbcPermissionAttribute (SecurityAction action) 
                        : base (action)
                {
@@ -33,27 +50,13 @@ namespace System.Data.Odbc
                #endregion
 
                #region Properties
-
-               [MonoTODO]
-               internal string Provider {
-                       [MonoTODO]
-                       get {
-                               throw new NotImplementedException (); 
-                       }
-                       [MonoTODO]
-                       set {
-                               throw new NotImplementedException (); 
-                       }
-               }
-
                #endregion
 
                #region Methods
 
-               [MonoTODO]
                public override IPermission CreatePermission () 
                {
-                       throw new NotImplementedException ();
+                       return new OdbcPermission (this);
                }
 
                #endregion