2010-03-09 Atsushi Enomoto <atsushi@ximian.com>

	* HttpListenerManager.cs : For ASP.NET, use correct GenericIdentity
	  type, and use null password unless we find a chance to get password
	  in ASP.NET HttpContext.

svn path=/trunk/mcs/; revision=153310

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index afa3d4fc1133ab440a6bdeb1bd5aeaff59c183ec..863e71e8d3852c0ad9c274c1079b7331da285cb1 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-09  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * HttpListenerManager.cs : For ASP.NET, use correct GenericIdentity
+         type, and use null password unless we find a chance to get password
+         in ASP.NET HttpContext.
+
 2010-03-03  Atsushi Enomoto  <atsushi@ximian.com>
 
        * HttpReplyChannel.cs, AspNetReplyChannel.cs, HttpChannelListener.cs,

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpListenerManager.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpListenerManager.cs
index 35471ba9674824b6b891f9f56c37e8e32450596a..4a8eda7fd1779f4f2ebb9bfc28410e6e6f5d672d 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpListenerManager.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpListenerManager.cs
@@ -123,12 +123,12 @@ namespace System.ServiceModel.Channels
                }
 
                public override string User {
-                       get { return ctx.User != null ? ((HttpListenerBasicIdentity) ctx.User.Identity).Name : null; }
+                       get { return ctx.User != null ? ((GenericIdentity) ctx.User.Identity).Name : null; }
                }
 
                // FIXME: how to acquire this?
                public override string Password {
-                       get { throw new NotImplementedException (); }
+                       get { return null; }
                }
 
                public override void ReturnUnauthorized ()