James Hawkins : secur32: Fix a few tests that fail in win2k3.
Alexandre Julliard
julliard at winehq.org
Thu May 22 06:26:49 CDT 2008
Module: wine
Branch: master
Commit: 6848da72d947443733b7d306940c51cf6dc1cec4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6848da72d947443733b7d306940c51cf6dc1cec4
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Wed May 21 17:39:17 2008 -0500
secur32: Fix a few tests that fail in win2k3.
---
dlls/secur32/tests/schannel.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
index 2fc793b..c6d6052 100644
--- a/dlls/secur32/tests/schannel.c
+++ b/dlls/secur32/tests/schannel.c
@@ -221,8 +221,8 @@ static void testAcquireSecurityContext(void)
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, NULL, NULL, NULL, &cred, &exp);
ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
- ok(exp.HighPart == 0 && exp.LowPart == 0,
- "Expected 0 expiry, got %08lx%08lx\n", exp.HighPart, exp.LowPart);
+ /* expriy is indeterminate in win2k3 */
+ trace("expiry: %08lx%08lx\n", exp.HighPart, exp.LowPart);
pFreeCredentialsHandle(&cred);
/* Bad version in SCHANNEL_CRED */
@@ -351,7 +351,9 @@ static void testAcquireSecurityContext(void)
pFreeCredentialsHandle(&cred);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
- ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
+ ok(st == SEC_E_OK ||
+ st == SEC_E_UNKNOWN_CREDENTIALS, /* win2k3 */
+ "AcquireCredentialsHandleA failed: %08x\n", st);
pFreeCredentialsHandle(&cred);
schanCred.dwVersion = SCHANNEL_CRED_VERSION;
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
@@ -360,8 +362,10 @@ static void testAcquireSecurityContext(void)
pFreeCredentialsHandle(&cred);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
- ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
- test_strength(&cred);
+ ok(st == SEC_E_OK ||
+ st == SEC_E_UNKNOWN_CREDENTIALS, /* win2k3 */
+ "AcquireCredentialsHandleA failed: %08x\n", st);
+ if (st == SEC_E_OK) test_strength(&cred);
pFreeCredentialsHandle(&cred);
/* How about more than one cert? */
More information about the wine-cvs
mailing list