The branch, master has been updated via 0b2b9fdeda0f7933df29a73ab7d6c511d5fd1c87 (commit) from 69af9eacb9214106b7448c59eb13a8bf0b832c91 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 0b2b9fdeda0f7933df29a73ab7d6c511d5fd1c87 Author: Günther Deschner <g...@samba.org> Date: Mon Jun 29 23:42:58 2009 +0200 s4-smbtorture: use torture_comment & torture_warning in RPC samr tests. Guenther ----------------------------------------------------------------------- Summary of changes: source4/torture/rpc/samr.c | 411 ++++++++++++++++++++++---------------------- 1 files changed, 206 insertions(+), 205 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 11f7b3e..f8853c1 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -633,7 +633,7 @@ static bool test_SetUserPass(struct dcerpc_pipe *p, struct torture_context *tctx status = dcerpc_fetch_session_key(p, &session_key); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u - no session key - %s\n", + torture_warning(tctx, "SetUserInfo level %u - no session key - %s\n", s.in.level, nt_errstr(status)); return false; } @@ -644,7 +644,7 @@ static bool test_SetUserPass(struct dcerpc_pipe *p, struct torture_context *tctx status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u failed - %s\n", + torture_warning(tctx, "SetUserInfo level %u failed - %s\n", s.in.level, nt_errstr(status)); ret = false; } else { @@ -689,7 +689,7 @@ static bool test_SetUserPass_23(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_fetch_session_key(p, &session_key); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u - no session key - %s\n", + torture_warning(tctx, "SetUserInfo level %u - no session key - %s\n", s.in.level, nt_errstr(status)); return false; } @@ -700,7 +700,7 @@ static bool test_SetUserPass_23(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u failed - %s\n", + torture_warning(tctx, "SetUserInfo level %u failed - %s\n", s.in.level, nt_errstr(status)); ret = false; } else { @@ -711,7 +711,7 @@ static bool test_SetUserPass_23(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_fetch_session_key(p, &session_key); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u - no session key - %s\n", + torture_warning(tctx, "SetUserInfo level %u - no session key - %s\n", s.in.level, nt_errstr(status)); return false; } @@ -724,7 +724,7 @@ static bool test_SetUserPass_23(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf("SetUserInfo level %u should have failed with WRONG_PASSWORD- %s\n", + torture_warning(tctx, "SetUserInfo level %u should have failed with WRONG_PASSWORD- %s\n", s.in.level, nt_errstr(status)); ret = false; } @@ -771,7 +771,7 @@ static bool test_SetUserPassEx(struct dcerpc_pipe *p, struct torture_context *tc status = dcerpc_fetch_session_key(p, &session_key); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u - no session key - %s\n", + torture_warning(tctx, "SetUserInfo level %u - no session key - %s\n", s.in.level, nt_errstr(status)); return false; } @@ -790,7 +790,7 @@ static bool test_SetUserPassEx(struct dcerpc_pipe *p, struct torture_context *tc status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u failed - %s\n", + torture_warning(tctx, "SetUserInfo level %u failed - %s\n", s.in.level, nt_errstr(status)); ret = false; } else { @@ -807,7 +807,7 @@ static bool test_SetUserPassEx(struct dcerpc_pipe *p, struct torture_context *tc status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf("SetUserInfo level %u should have failed with WRONG_PASSWORD: %s\n", + torture_warning(tctx, "SetUserInfo level %u should have failed with WRONG_PASSWORD: %s\n", s.in.level, nt_errstr(status)); ret = false; } else { @@ -854,7 +854,7 @@ static bool test_SetUserPass_25(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_fetch_session_key(p, &session_key); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u - no session key - %s\n", + torture_warning(tctx, "SetUserInfo level %u - no session key - %s\n", s.in.level, nt_errstr(status)); return false; } @@ -873,7 +873,7 @@ static bool test_SetUserPass_25(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u failed - %s\n", + torture_warning(tctx, "SetUserInfo level %u failed - %s\n", s.in.level, nt_errstr(status)); ret = false; } else { @@ -890,7 +890,7 @@ static bool test_SetUserPass_25(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf("SetUserInfo level %u should have failed with WRONG_PASSWORD- %s\n", + torture_warning(tctx, "SetUserInfo level %u should have failed with WRONG_PASSWORD- %s\n", s.in.level, nt_errstr(status)); ret = false; } @@ -935,7 +935,7 @@ static bool test_SetUserPass_18(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_fetch_session_key(p, &session_key); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u - no session key - %s\n", + torture_warning(tctx, "SetUserInfo level %u - no session key - %s\n", s.in.level, nt_errstr(status)); return false; } @@ -959,7 +959,7 @@ static bool test_SetUserPass_18(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u failed - %s\n", + torture_warning(tctx, "SetUserInfo level %u failed - %s\n", s.in.level, nt_errstr(status)); ret = false; } else { @@ -1020,7 +1020,7 @@ static bool test_SetUserPass_21(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_fetch_session_key(p, &session_key); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u - no session key - %s\n", + torture_warning(tctx, "SetUserInfo level %u - no session key - %s\n", s.in.level, nt_errstr(status)); return false; } @@ -1047,7 +1047,7 @@ static bool test_SetUserPass_21(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u failed - %s\n", + torture_warning(tctx, "SetUserInfo level %u failed - %s\n", s.in.level, nt_errstr(status)); ret = false; } else { @@ -1062,7 +1062,7 @@ static bool test_SetUserPass_21(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) { - printf("SetUserInfo level %u should have failed with NT_STATUS_INVALID_PARAMETER - %s\n", + torture_warning(tctx, "SetUserInfo level %u should have failed with NT_STATUS_INVALID_PARAMETER - %s\n", s.in.level, nt_errstr(status)); ret = false; } @@ -1075,7 +1075,7 @@ static bool test_SetUserPass_21(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_samr_SetUserInfo(p, tctx, &s); if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) { - printf("SetUserInfo level %u should have failed with NT_STATUS_INVALID_PARAMETER - %s\n", + torture_warning(tctx, "SetUserInfo level %u should have failed with NT_STATUS_INVALID_PARAMETER - %s\n", s.in.level, nt_errstr(status)); ret = false; } @@ -1203,7 +1203,7 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p, status = dcerpc_fetch_session_key(p, &session_key); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u - no session key - %s\n", + torture_warning(tctx, "SetUserInfo level %u - no session key - %s\n", s.in.level, nt_errstr(status)); return false; } @@ -1297,7 +1297,7 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p, } if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo%s level %u failed - %s\n", + torture_warning(tctx, "SetUserInfo%s level %u failed - %s\n", use_setinfo2 ? "2":"", level, nt_errstr(status)); ret = false; } else { @@ -1332,12 +1332,12 @@ static bool test_SetAliasInfo(struct dcerpc_pipe *p, struct torture_context *tct case ALIASINFONAME: init_lsa_String(&r.in.info->name,TEST_ALIASNAME); break; case ALIASINFODESCRIPTION: init_lsa_String(&r.in.info->description, "Test Description, should test I18N as well"); break; - case ALIASINFOALL: printf("ALIASINFOALL ignored\n"); break; + case ALIASINFOALL: torture_comment(tctx, "ALIASINFOALL ignored\n"); break; } status = dcerpc_samr_SetAliasInfo(p, tctx, &r); if (!NT_STATUS_IS_OK(status)) { - printf("SetAliasInfo level %u failed - %s\n", + torture_warning(tctx, "SetAliasInfo level %u failed - %s\n", levels[i], nt_errstr(status)); ret = false; } @@ -1348,7 +1348,7 @@ static bool test_SetAliasInfo(struct dcerpc_pipe *p, struct torture_context *tct status = dcerpc_samr_QueryAliasInfo(p, tctx, &q); if (!NT_STATUS_IS_OK(status)) { - printf("QueryAliasInfo level %u failed - %s\n", + torture_warning(tctx, "QueryAliasInfo level %u failed - %s\n", levels[i], nt_errstr(status)); ret = false; } @@ -1457,7 +1457,7 @@ static NTSTATUS test_LookupName(struct dcerpc_pipe *p, struct torture_context *t n.in.num_names = 2; status = dcerpc_samr_LookupNames(p, tctx, &n); if (!NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) { - printf("LookupNames[2] failed - %s\n", nt_errstr(status)); + torture_warning(tctx, "LookupNames[2] failed - %s\n", nt_errstr(status)); if (NT_STATUS_IS_OK(status)) { return NT_STATUS_UNSUCCESSFUL; } @@ -1467,7 +1467,7 @@ static NTSTATUS test_LookupName(struct dcerpc_pipe *p, struct torture_context *t n.in.num_names = 0; status = dcerpc_samr_LookupNames(p, tctx, &n); if (!NT_STATUS_IS_OK(status)) { - printf("LookupNames[0] failed - %s\n", nt_errstr(status)); + torture_warning(tctx, "LookupNames[0] failed - %s\n", nt_errstr(status)); return status; } @@ -1475,7 +1475,7 @@ static NTSTATUS test_LookupName(struct dcerpc_pipe *p, struct torture_context *t n.in.num_names = 1; status = dcerpc_samr_LookupNames(p, tctx, &n); if (!NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) { - printf("LookupNames[1 bad name] failed - %s\n", nt_errstr(status)); + torture_warning(tctx, "LookupNames[1 bad name] failed - %s\n", nt_errstr(status)); if (NT_STATUS_IS_OK(status)) { return NT_STATUS_UNSUCCESSFUL; } @@ -1487,7 +1487,7 @@ static NTSTATUS test_LookupName(struct dcerpc_pipe *p, struct torture_context *t n.in.num_names = 2; status = dcerpc_samr_LookupNames(p, tctx, &n); if (!NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) { - printf("LookupNames[2 bad names] failed - %s\n", nt_errstr(status)); + torture_warning(tctx, "LookupNames[2 bad names] failed - %s\n", nt_errstr(status)); if (NT_STATUS_IS_OK(status)) { return NT_STATUS_UNSUCCESSFUL; } @@ -1517,7 +1517,7 @@ static NTSTATUS test_OpenUser_byname(struct dcerpc_pipe *p, r.out.user_handle = user_handle; status = dcerpc_samr_OpenUser(p, tctx, &r); if (!NT_STATUS_IS_OK(status)) { - printf("OpenUser_byname(%s -> %d) failed - %s\n", name, rid, nt_errstr(status)); + torture_warning(tctx, "OpenUser_byname(%s -> %d) failed - %s\n", name, rid, nt_errstr(status)); } return status; @@ -1543,10 +1543,10 @@ static bool test_ChangePasswordNT3(struct dcerpc_pipe *p, return false; } - printf("Testing ChangePasswordUser for user 'testuser'\n"); + torture_comment(tctx, "Testing ChangePasswordUser for user 'testuser'\n"); - printf("old password: %s\n", oldpass); - printf("new password: %s\n", newpass); + torture_comment(tctx, "old password: %s\n", oldpass); + torture_comment(tctx, "new password: %s\n", newpass); E_md4hash(oldpass, old_nt_hash); E_md4hash(newpass, new_nt_hash); @@ -1574,7 +1574,7 @@ static bool test_ChangePasswordNT3(struct dcerpc_pipe *p, status = dcerpc_samr_ChangePasswordUser(p, tctx, &r); if (!NT_STATUS_IS_OK(status)) { - printf("ChangePasswordUser failed - %s\n", nt_errstr(status)); + torture_warning(tctx, "ChangePasswordUser failed - %s\n", nt_errstr(status)); ret = false; } @@ -1695,7 +1695,7 @@ static bool test_ChangePasswordUser(struct dcerpc_pipe *p, struct torture_contex status = dcerpc_samr_ChangePasswordUser(p, tctx, &r); if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf("ChangePasswordUser failed: expected NT_STATUS_WRONG_PASSWORD because we broke the LM cross-hash, got %s\n", nt_errstr(status)); + torture_warning(tctx, "ChangePasswordUser failed: expected NT_STATUS_WRONG_PASSWORD because we broke the LM cross-hash, got %s\n", nt_errstr(status)); ret = false; } @@ -1718,7 +1718,7 @@ static bool test_ChangePasswordUser(struct dcerpc_pipe *p, struct torture_contex status = dcerpc_samr_ChangePasswordUser(p, tctx, &r); if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf("ChangePasswordUser failed: expected NT_STATUS_WRONG_PASSWORD because we broke the NT cross-hash, got %s\n", nt_errstr(status)); + torture_warning(tctx, "ChangePasswordUser failed: expected NT_STATUS_WRONG_PASSWORD because we broke the NT cross-hash, got %s\n", nt_errstr(status)); ret = false; } @@ -1751,7 +1751,7 @@ static bool test_ChangePasswordUser(struct dcerpc_pipe *p, struct torture_contex changed = true; *password = newpass; } else if (!NT_STATUS_EQUAL(NT_STATUS_PASSWORD_RESTRICTION, status)) { - printf("ChangePasswordUser failed: expected NT_STATUS_OK, or at least NT_STATUS_PASSWORD_RESTRICTION, got %s\n", nt_errstr(status)); + torture_warning(tctx, "ChangePasswordUser failed: expected NT_STATUS_OK, or at least NT_STATUS_PASSWORD_RESTRICTION, got %s\n", nt_errstr(status)); ret = false; } @@ -1789,7 +1789,7 @@ static bool test_ChangePasswordUser(struct dcerpc_pipe *p, struct torture_contex changed = true; *password = newpass; } else if (!NT_STATUS_EQUAL(NT_STATUS_PASSWORD_RESTRICTION, status)) { - printf("ChangePasswordUser failed: expected NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED, got %s\n", nt_errstr(status)); + torture_warning(tctx, "ChangePasswordUser failed: expected NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED, got %s\n", nt_errstr(status)); ret = false; } @@ -1824,9 +1824,9 @@ static bool test_ChangePasswordUser(struct dcerpc_pipe *p, struct torture_contex status = dcerpc_samr_ChangePasswordUser(p, tctx, &r); if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)) { - printf("ChangePasswordUser returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status)); + torture_comment(tctx, "ChangePasswordUser returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status)); } else if (!NT_STATUS_IS_OK(status)) { - printf("ChangePasswordUser failed - %s\n", nt_errstr(status)); + torture_warning(tctx, "ChangePasswordUser failed - %s\n", nt_errstr(status)); ret = false; } else { changed = true; @@ -1848,9 +1848,9 @@ static bool test_ChangePasswordUser(struct dcerpc_pipe *p, struct torture_contex if (changed) { status = dcerpc_samr_ChangePasswordUser(p, tctx, &r); if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)) { - printf("ChangePasswordUser returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status)); + torture_comment(tctx, "ChangePasswordUser returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status)); } else if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf("ChangePasswordUser failed: expected NT_STATUS_WRONG_PASSWORD because we already changed the password, got %s\n", nt_errstr(status)); + torture_warning(tctx, "ChangePasswordUser failed: expected NT_STATUS_WRONG_PASSWORD because we already changed the password, got %s\n", nt_errstr(status)); ret = false; } } @@ -1924,7 +1924,7 @@ static bool test_OemChangePasswordUser2(struct dcerpc_pipe *p, struct torture_co if (!NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION) && !NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf("OemChangePasswordUser2 failed, should have returned WRONG_PASSWORD (or at least 'PASSWORD_RESTRICTON') for invalid password verifier - %s\n", + torture_warning(tctx, "OemChangePasswordUser2 failed, should have returned WRONG_PASSWORD (or at least 'PASSWORD_RESTRICTON') for invalid password verifier - %s\n", nt_errstr(status)); ret = false; } @@ -1946,7 +1946,7 @@ static bool test_OemChangePasswordUser2(struct dcerpc_pipe *p, struct torture_co if (!NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION) && !NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf("OemChangePasswordUser2 failed, should have returned WRONG_PASSWORD (or at least 'PASSWORD_RESTRICTON') for invalidly encrpted password - %s\n", + torture_warning(tctx, "OemChangePasswordUser2 failed, should have returned WRONG_PASSWORD (or at least 'PASSWORD_RESTRICTON') for invalidly encrpted password - %s\n", nt_errstr(status)); ret = false; } @@ -1963,7 +1963,7 @@ static bool test_OemChangePasswordUser2(struct dcerpc_pipe *p, struct torture_co if (!NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION) && !NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) { - printf("OemChangePasswordUser2 failed, should have returned INVALID_PARAMETER (or at least 'PASSWORD_RESTRICTON') for no supplied validation hash - %s\n", + torture_warning(tctx, "OemChangePasswordUser2 failed, should have returned INVALID_PARAMETER (or at least 'PASSWORD_RESTRICTON') for no supplied validation hash - %s\n", nt_errstr(status)); ret = false; } @@ -1975,7 +1975,7 @@ static bool test_OemChangePasswordUser2(struct dcerpc_pipe *p, struct torture_co status = dcerpc_samr_OemChangePasswordUser2(p, tctx, &r); if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) { - printf("OemChangePasswordUser2 failed, should have returned INVALID_PARAMETER for no supplied validation hash and invalid user - %s\n", + torture_warning(tctx, "OemChangePasswordUser2 failed, should have returned INVALID_PARAMETER for no supplied validation hash and invalid user - %s\n", nt_errstr(status)); ret = false; } @@ -1989,7 +1989,7 @@ static bool test_OemChangePasswordUser2(struct dcerpc_pipe *p, struct torture_co status = dcerpc_samr_OemChangePasswordUser2(p, tctx, &r); if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf("OemChangePasswordUser2 failed, should have returned WRONG_PASSWORD for invalid user - %s\n", + torture_warning(tctx, "OemChangePasswordUser2 failed, should have returned WRONG_PASSWORD for invalid user - %s\n", nt_errstr(status)); ret = false; } @@ -2003,7 +2003,7 @@ static bool test_OemChangePasswordUser2(struct dcerpc_pipe *p, struct torture_co status = dcerpc_samr_OemChangePasswordUser2(p, tctx, &r); if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) { - printf("OemChangePasswordUser2 failed, should have returned INVALID_PARAMETER for no supplied password and invalid user - %s\n", + torture_warning(tctx, "OemChangePasswordUser2 failed, should have returned INVALID_PARAMETER for no supplied password and invalid user - %s\n", nt_errstr(status)); ret = false; } @@ -2022,9 +2022,9 @@ static bool test_OemChangePasswordUser2(struct dcerpc_pipe *p, struct torture_co status = dcerpc_samr_OemChangePasswordUser2(p, tctx, &r); if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)) { - printf("OemChangePasswordUser2 returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status)); + torture_comment(tctx, "OemChangePasswordUser2 returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status)); } else if (!NT_STATUS_IS_OK(status)) { - printf("OemChangePasswordUser2 failed - %s\n", nt_errstr(status)); + torture_warning(tctx, "OemChangePasswordUser2 failed - %s\n", nt_errstr(status)); ret = false; } else { *password = newpass; @@ -2101,9 +2101,9 @@ static bool test_ChangePasswordUser2(struct dcerpc_pipe *p, struct torture_conte status = dcerpc_samr_ChangePasswordUser2(p, tctx, &r); if (allow_password_restriction && NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)) { - printf("ChangePasswordUser2 returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status)); + torture_comment(tctx, "ChangePasswordUser2 returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status)); } else if (!NT_STATUS_IS_OK(status)) { - printf("ChangePasswordUser2 failed - %s\n", nt_errstr(status)); + torture_warning(tctx, "ChangePasswordUser2 failed - %s\n", nt_errstr(status)); ret = false; } else { *password = newpass; @@ -2186,7 +2186,7 @@ bool test_ChangePasswordUser3(struct dcerpc_pipe *p, struct torture_context *tct status = dcerpc_samr_ChangePasswordUser3(p, tctx, &r); if (!NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION) && (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD))) { - printf("ChangePasswordUser3 failed, should have returned WRONG_PASSWORD (or at least 'PASSWORD_RESTRICTON') for invalid password verifier - %s\n", + torture_warning(tctx, "ChangePasswordUser3 failed, should have returned WRONG_PASSWORD (or at least 'PASSWORD_RESTRICTON') for invalid password verifier - %s\n", nt_errstr(status)); ret = false; } @@ -2217,7 +2217,7 @@ bool test_ChangePasswordUser3(struct dcerpc_pipe *p, struct torture_context *tct status = dcerpc_samr_ChangePasswordUser3(p, tctx, &r); if (!NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION) && (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD))) { - printf("ChangePasswordUser3 failed, should have returned WRONG_PASSWORD (or at least 'PASSWORD_RESTRICTON') for invalidly encrpted password - %s\n", + torture_warning(tctx, "ChangePasswordUser3 failed, should have returned WRONG_PASSWORD (or at least 'PASSWORD_RESTRICTON') for invalidly encrpted password - %s\n", nt_errstr(status)); ret = false; } @@ -2228,7 +2228,7 @@ bool test_ChangePasswordUser3(struct dcerpc_pipe *p, struct torture_context *tct r.in.account = &account_bad; status = dcerpc_samr_ChangePasswordUser3(p, tctx, &r); if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf("ChangePasswordUser3 failed, should have returned WRONG_PASSWORD for invalid username - %s\n", + torture_warning(tctx, "ChangePasswordUser3 failed, should have returned WRONG_PASSWORD for invalid username - %s\n", nt_errstr(status)); ret = false; } @@ -2270,7 +2270,7 @@ bool test_ChangePasswordUser3(struct dcerpc_pipe *p, struct torture_context *tct if (dominfo->password_properties & DOMAIN_REFUSE_PASSWORD_CHANGE ) { if (reject && (reject->reason != SAMR_REJECT_OTHER)) { - printf("expected SAMR_REJECT_OTHER (%d), got %d\n", + torture_warning(tctx, "expected SAMR_REJECT_OTHER (%d), got %d\n", SAMR_REJECT_OTHER, reject->reason); return false; } @@ -2289,7 +2289,7 @@ bool test_ChangePasswordUser3(struct dcerpc_pipe *p, struct torture_context *tct (last_password_change + dominfo->min_password_age > t)) { if (reject->reason != SAMR_REJECT_OTHER) { - printf("expected SAMR_REJECT_OTHER (%d), got %d\n", + torture_warning(tctx, "expected SAMR_REJECT_OTHER (%d), got %d\n", SAMR_REJECT_OTHER, reject->reason); return false; } @@ -2298,7 +2298,7 @@ bool test_ChangePasswordUser3(struct dcerpc_pipe *p, struct torture_context *tct (strlen(newpass) < dominfo->min_password_length)) { if (reject->reason != SAMR_REJECT_TOO_SHORT) { - printf("expected SAMR_REJECT_TOO_SHORT (%d), got %d\n", + torture_warning(tctx, "expected SAMR_REJECT_TOO_SHORT (%d), got %d\n", SAMR_REJECT_TOO_SHORT, reject->reason); return false; } @@ -2307,14 +2307,14 @@ bool test_ChangePasswordUser3(struct dcerpc_pipe *p, struct torture_context *tct strequal(oldpass, newpass)) { if (reject->reason != SAMR_REJECT_IN_HISTORY) { - printf("expected SAMR_REJECT_IN_HISTORY (%d), got %d\n", + torture_warning(tctx, "expected SAMR_REJECT_IN_HISTORY (%d), got %d\n", SAMR_REJECT_IN_HISTORY, reject->reason); return false; } } else if (dominfo->password_properties & DOMAIN_PASSWORD_COMPLEX) { if (reject->reason != SAMR_REJECT_COMPLEXITY) { - printf("expected SAMR_REJECT_COMPLEXITY (%d), got %d\n", + torture_warning(tctx, "expected SAMR_REJECT_COMPLEXITY (%d), got %d\n", SAMR_REJECT_COMPLEXITY, reject->reason); return false; } @@ -2331,7 +2331,7 @@ bool test_ChangePasswordUser3(struct dcerpc_pipe *p, struct torture_context *tct } else if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)) { if (reject && reject->reason != SAMR_REJECT_OTHER) { - printf("expected SAMR_REJECT_OTHER (%d), got %d\n", + torture_warning(tctx, "expected SAMR_REJECT_OTHER (%d), got %d\n", SAMR_REJECT_OTHER, reject->reason); return false; } @@ -2392,7 +2392,7 @@ bool test_ChangePasswordRandomBytes(struct dcerpc_pipe *p, struct torture_contex status = dcerpc_fetch_session_key(p, &session_key); if (!NT_STATUS_IS_OK(status)) { - printf("SetUserInfo level %u - no session key - %s\n", + torture_warning(tctx, "SetUserInfo level %u - no session key - %s\n", -- Samba Shared Repository