s4:torture/rpc: let rpc.samlogon test credential_flags again...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 925d312920ac8a2719762e098185b6488ec7f4b3..2d9e21fead5c2fcab16bcb8aa3387c48a54a92b8 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -2110,6 +2110,7 @@ sub provision_ad_dc()
        CVE_2020_1472:warn_about_unused_debug_level = 3
        CVE_2022_38023:warn_about_unused_debug_level = 3
        CVE_2022_38023:error_debug_level = 2
+       allow nt4 crypto:samlogontest\$ = yes
        server reject md5 schannel:schannel2\$ = no
        server reject md5 schannel:schannel3\$ = no
        server reject md5 schannel:schannel8\$ = no

diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 21891694537d2366dd3a2dc1883aa79ca7471e5b..fa210c9cabc97a5f04f60f72a486e8f6a66458a3 100644 (file)
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -2112,12 +2112,18 @@ bool torture_rpc_samlogon(struct torture_context *torture)
                 * session key encryption) */
 
                for (i=0; i < ARRAY_SIZE(credential_flags); i++) {
-                       /* TODO:  Somehow we lost setting up the different credential flags here! */
-
                        torture_comment(torture,
                                        "Testing with flags: 0x%08x\n",
                                        credential_flags[i]);
 
+                       ret = test_SetupCredentials2(p,
+                                                    torture,
+                                                    credential_flags[i],
+                                                    machine_credentials,
+                                                    SEC_CHAN_WKSTA,
+                                                    &creds);
+                       torture_assert_goto(torture, ret, ret, failed, "test_SetupCredentials2()\n");
+
                        torture_assert_goto(torture,
                                            test_InteractiveLogon(p, mem_ctx, torture, creds,
                                                                  usercreds[0].comment,