Changeset 920 for trunk/server/source4/torture/rpc

Timestamp:

Jun 9, 2016, 2:23:12 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: apply latest security patches to trunk

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/torture/rpc/rpc.c (modified) (1 diff)
• source4/torture/rpc/samba3rpc.c (modified) (1 diff)
• source4/torture/rpc/samr.c (modified) (4 diffs)

trunk/server/source4/torture/rpc/rpc.c

@@ -502 +502 @@
         torture_suite_add_suite(suite, torture_rpc_samr_passwords_badpwdcount(suite));
         torture_suite_add_suite(suite, torture_rpc_samr_passwords_lockout(suite));
+        torture_suite_add_suite(suite, torture_rpc_samr_passwords_validate(suite));
         torture_suite_add_suite(suite, torture_rpc_samr_user_privileges(suite));
         torture_suite_add_suite(suite, torture_rpc_samr_large_dc(suite));

trunk/server/source4/torture/rpc/samba3rpc.c

@@ -1123 +1123 @@
                 names_blob = NTLMv2_generate_names_blob(
                         mem_ctx,
-                        cli_credentials_get_workstation(user_creds),
-                        cli_credentials_get_domain(user_creds));
+                        cli_credentials_get_workstation(wks_creds),
+                        cli_credentials_get_domain(wks_creds));
                 status = cli_credentials_get_ntlm_response(
                         user_creds, mem_ctx, &flags, chal, names_blob,

trunk/server/source4/torture/rpc/samr.c

@@ -7939 +7939 @@
 
 
-static bool test_samr_ValidatePassword(struct dcerpc_pipe *p,
-                                       struct torture_context *tctx)
+static bool test_samr_ValidatePassword(struct torture_context *tctx,
+                                       struct dcerpc_pipe *p)
 {
         struct samr_ValidatePassword r;
@@ -7952 +7952 @@
         torture_comment(tctx, "Testing samr_ValidatePassword\n");
 
+        if (p->conn->transport.transport != NCACN_IP_TCP) {
+                torture_comment(tctx, "samr_ValidatePassword only should succeed over NCACN_IP_TCP!\n");
+        }
+
         ZERO_STRUCT(r);
         r.in.level = NetValidatePasswordReset;
@@ -8075 +8079 @@
         ret &= test_samr_handle_Close(b, torture, &ctx->handle);
 
-        ret &= test_samr_ValidatePassword(p, torture);
-
         return ret;
 }
@@ -8371 +8373 @@
 }
 
-
+struct torture_suite *torture_rpc_samr_passwords_validate(TALLOC_CTX *mem_ctx)
+{
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "samr.passwords.validate");
+        struct torture_rpc_tcase *tcase;
+
+        tcase = torture_suite_add_rpc_iface_tcase(suite, "samr",
+                                                  &ndr_table_samr);
+        torture_rpc_tcase_add_test(tcase, "validate",
+                                   test_samr_ValidatePassword);
+
+        return suite;
+}