Alistair Leslie-Hughes : netapi32: Fix tests when the machine is on DOMAIN.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4ece5deeeffa22b66e0a5777b6f700251a0fb691
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4ece5deeeffa22b66e0a5777b6...

Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Date:   Wed May 28 18:04:37 2008 +1000

netapi32: Fix tests when the machine is on DOMAIN.

---

 dlls/netapi32/tests/access.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c
index b1036a9..eae713f 100644
--- a/dlls/netapi32/tests/access.c
+++ b/dlls/netapi32/tests/access.c
@@ -296,7 +296,8 @@ static void run_userhandling_tests(void)
 
     ret = pNetUserChangePassword(NULL, sNonexistentUser, sTestUserOldPass,
             sTestUserNewPass);
-    ok(ret == NERR_UserNotFound || ret == ERROR_INVALID_PASSWORD,
+    ok(ret == NERR_UserNotFound || ret == ERROR_INVALID_PASSWORD ||
+       ret == ERROR_CANT_ACCESS_DOMAIN_INFO,
             "Changing password for nonexistent user returned 0x%08x.\n", ret);
 
     ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass,
@@ -304,12 +305,13 @@ static void run_userhandling_tests(void)
     /* Apparently NERR_PasswordTooShort can be returned on windows xp if a
      * strict password policy is enforced
      */
-    ok(ret == NERR_Success || ret == NERR_PasswordTooShort,
+    ok(ret == NERR_Success || ret == NERR_PasswordTooShort ||
+       ret == ERROR_CANT_ACCESS_DOMAIN_INFO || ret == ERROR_INVALID_PASSWORD,
             "Changing old password to old password returned 0x%08x.\n", ret);
 
     ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserNewPass,
             sTestUserOldPass);
-    ok(ret == ERROR_INVALID_PASSWORD,
+    ok(ret == ERROR_INVALID_PASSWORD || ret == ERROR_CANT_ACCESS_DOMAIN_INFO,
             "Trying to change password giving an invalid password returned 0x%08x.\n", ret);
 
     ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass,
@@ -319,7 +321,8 @@ static void run_userhandling_tests(void)
 
     ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass,
             sTestUserNewPass);
-    ok(ret == NERR_Success, "Changing the password correctly returned 0x%08x.\n", ret);
+    ok(ret == NERR_Success || ret == ERROR_CANT_ACCESS_DOMAIN_INFO ||
+       ret == ERROR_INVALID_PASSWORD, "Changing the password correctly returned 0x%08x.\n", ret);
 
     ret = pNetUserDel(NULL, sTestUserName);
     ok(ret == NERR_Success, "Deleting the user failed.\n");