Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-1562: Typo in WindowsNegotiateScheme 

Contributed by Michael Osipov <michaelo at apache.org>

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1630126 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2014-10-08 14:42:35 +00:00
parent c69064b336
commit ebc0587569
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
View File

@ -77,7 +77,7 @@ public class WindowsNegotiateScheme extends AuthSchemeBase {
private final String servicePrincipalName;
private CredHandle clientCred;
private CtxtHandle sppicontext;
private CtxtHandle sspiContext;
private boolean continueNeeded;
private String challenge;
@ -101,15 +101,15 @@ public class WindowsNegotiateScheme extends AuthSchemeBase {
throw new Win32Exception(rc);
}
}
if (sppicontext != null && !sppicontext.isNull()) {
final int rc = Secur32.INSTANCE.DeleteSecurityContext(sppicontext);
if (sspiContext != null && !sspiContext.isNull()) {
final int rc = Secur32.INSTANCE.DeleteSecurityContext(sspiContext);
if (WinError.SEC_E_OK != rc) {
throw new Win32Exception(rc);
}
}
continueNeeded = true; // waiting
clientCred = null;
sppicontext = null;
sspiContext = null;
}
@Override
@ -205,7 +205,7 @@ public class WindowsNegotiateScheme extends AuthSchemeBase {
final SecBufferDesc continueTokenBuffer = new SecBufferDesc(
Sspi.SECBUFFER_TOKEN, continueTokenBytes);
final String targetName = getServicePrincipalName(context);
response = getToken(this.sppicontext, continueTokenBuffer, targetName);
response = getToken(this.sspiContext, continueTokenBuffer, targetName);
} catch (RuntimeException ex) {
failAuthCleanup();
if (ex instanceof Win32Exception) {
@ -273,10 +273,10 @@ public class WindowsNegotiateScheme extends AuthSchemeBase {
final SecBufferDesc token = new SecBufferDesc(
Sspi.SECBUFFER_TOKEN, Sspi.MAX_TOKEN_SIZE);
sppicontext = new CtxtHandle();
sspiContext = new CtxtHandle();
final int rc = Secur32.INSTANCE.InitializeSecurityContext(clientCred,
continueCtx, targetName, Sspi.ISC_REQ_DELEGATE | Sspi.ISC_REQ_MUTUAL_AUTH, 0,
Sspi.SECURITY_NATIVE_DREP, continueToken, 0, sppicontext, token,
continueCtx, targetName, Sspi.ISC_REQ_CONNECTION | Sspi.ISC_REQ_DELEGATE, 0,
Sspi.SECURITY_NATIVE_DREP, continueToken, 0, sspiContext, token,
attr, null);
switch (rc) {
case WinError.SEC_I_CONTINUE_NEEDED: