Merge branch 'immo7-patch-1'

Waffle · Dec 12, 2015 · 20ea0b4 · 20ea0b4
2 parents 405943b + dbd5f4b
commit 20ea0b4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * Change .net target to more modern .net 4.0 framework
 * [#296](https://github.com/dblock/waffle/pull/296): Added Tomcat 9 support.
 * [#268](https://github.com/dblock/waffle/pull/301): Cannot log in automatically on machine where Tomcat service is running
+* [#274](https://github.com/dblock/waffle/pull/274): Update WindowsSecurityContextImpl.java to handle SEC_E_BUFFER_TOO_SMALL
 
 1.8.0 (09/10/15)
 ================

diff --git a/Source/JNA/waffle-jna/src/main/java/waffle/windows/auth/impl/WindowsSecurityContextImpl.java b/Source/JNA/waffle-jna/src/main/java/waffle/windows/auth/impl/WindowsSecurityContextImpl.java
@@ -147,6 +147,9 @@ public void initialize(final CtxtHandle continueCtx, final SecBufferDesc continu
                 case WinError.SEC_E_INSUFFICIENT_MEMORY:
                     tokenSize += Sspi.MAX_TOKEN_SIZE;
                     break;
+                case WinError.SEC_E_BUFFER_TOO_SMALL:
+                    tokenSize += Sspi.MAX_TOKEN_SIZE;
+                    break;
                 case WinError.SEC_I_CONTINUE_NEEDED:
                     this.continueFlag = true;
                     break;
@@ -156,7 +159,7 @@ public void initialize(final CtxtHandle continueCtx, final SecBufferDesc continu
                 default:
                     throw new Win32Exception(rc);
             }
-        } while (rc == WinError.SEC_E_INSUFFICIENT_MEMORY);
+        } while (rc == WinError.SEC_E_INSUFFICIENT_MEMORY || rc == WinError.SEC_E_BUFFER_TOO_SMALL);
     }
 
     /*