From b5b16530cc8c647f23e71efe7916af3140257590 Mon Sep 17 00:00:00 2001 From: antiduh Date: Thu, 3 Jul 2014 21:02:33 +0000 Subject: [PATCH] Rename Credential.Name to PrincipleName. PrincipleName comes from the security service provider, which may not correspond to the domain user name. For instance, if I'm using kerberos on my domain, my principle may be user@DIVISION.CORP.COM, meanwhile my username might be CORP\user. --- NSspi/Credentials/Credential.cs | 2 +- NsspiDemo/Program.cs | 4 ++-- TestClient/ClientForm.cs | 2 +- TestServer/ServerForm.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NSspi/Credentials/Credential.cs b/NSspi/Credentials/Credential.cs index db349f7..543250f 100644 --- a/NSspi/Credentials/Credential.cs +++ b/NSspi/Credentials/Credential.cs @@ -72,7 +72,7 @@ namespace NSspi.Credentials /// /// Returns the name of the principle of the credential. /// - public string Name + public string PrincipleName { get { diff --git a/NsspiDemo/Program.cs b/NsspiDemo/Program.cs index ac7780e..cd8a636 100644 --- a/NsspiDemo/Program.cs +++ b/NsspiDemo/Program.cs @@ -33,11 +33,11 @@ namespace NSspi clientCred = new ClientCredential( packageName ); serverCred = new ServerCredential( packageName ); - Console.Out.WriteLine( clientCred.Name ); + Console.Out.WriteLine( clientCred.PrincipleName ); client = new ClientContext( clientCred, - serverCred.Name, + serverCred.PrincipleName, ContextAttrib.MutualAuth | ContextAttrib.InitIdentify | ContextAttrib.Confidentiality | diff --git a/TestClient/ClientForm.cs b/TestClient/ClientForm.cs index fad3d93..4e661b5 100644 --- a/TestClient/ClientForm.cs +++ b/TestClient/ClientForm.cs @@ -66,7 +66,7 @@ namespace TestClient this.connection.Disconnected += connection_Disconnected; // --- UI Fillout --- - this.usernameTextbox.Text = this.cred.Name; + this.usernameTextbox.Text = this.cred.PrincipleName; UpdateButtons(); } diff --git a/TestServer/ServerForm.cs b/TestServer/ServerForm.cs index 16a33e8..3d96b55 100644 --- a/TestServer/ServerForm.cs +++ b/TestServer/ServerForm.cs @@ -66,7 +66,7 @@ namespace TestServer UpdateButtons(); - this.serverUsernameTextbox.Text = this.serverCred.Name; + this.serverUsernameTextbox.Text = this.serverCred.PrincipleName; } private void Form1_FormClosing( object sender, FormClosingEventArgs e )