Merge pull request #2020 from tomjepp/master

[mono.git] / mcs / class / System / System.Net / NetworkCredential.cs

diff --git a/mcs/class/System/System.Net/NetworkCredential.cs b/mcs/class/System/System.Net/NetworkCredential.cs
index 71f9f5b2689cad22d3c6ffe73dc2e3c192d441b8..faba55dd4fe05654831e9b0c02be46146bc7198c 100644 (file)
--- a/mcs/class/System/System.Net/NetworkCredential.cs
+++ b/mcs/class/System/System.Net/NetworkCredential.cs
@@ -1,12 +1,13 @@
 //
 // System.Net.NetworkCredential.cs
 //
-// Author: Duncan Mak (duncan@ximian.com)
-// Author: Rolf Bjarne KVinge (rolf@xamarin.com)
+// Authors: Duncan Mak (duncan@ximian.com)
+//          Rolf Bjarne KVinge (rolf@xamarin.com)
+//          Marek Safar (marek.safar@gmail.com)
 //
 // (C) Ximian, Inc.
 // Copyright (C) 2010 Novell, Inc (http://www.novell.com)
-// Copyright (C) 2011 Xamarin Inc (http://www.xamarin.com)
+// Copyright (C) 2011, 2014 Xamarin Inc (http://www.xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -40,9 +41,7 @@ namespace System.Net
                string password;
                string domain;
                
-#if NET_4_0
                SecureString securePassword;
-#endif
 
                // Constructors
                public NetworkCredential ()
@@ -56,12 +55,22 @@ namespace System.Net
                }
 
                public NetworkCredential (string userName, string password, string domain)
+                       : this (userName, password)
                {
-                       this.userName = userName;
-                       this.password = password;
                        this.domain = domain;
                }
 
+               public NetworkCredential (string userName, SecureString password)
+               {
+                       this.userName = userName;
+                       SecurePassword = password;
+               }
+
+               public NetworkCredential (string userName, SecureString password, string domain)
+                       : this (userName, password)
+               {
+                       this.domain = domain;
+               }
                // Properties
 
                public string Domain {
@@ -79,7 +88,6 @@ namespace System.Net
                        set { password = value; }
                }
 
-#if NET_4_0
                public SecureString SecurePassword {
                        get { return securePassword; }
                        set {
@@ -90,7 +98,6 @@ namespace System.Net
                                }
                        }
                }
-#endif
 
                public NetworkCredential GetCredential (Uri uri, string authType)
                {