Changeset 752 for trunk/server/source4/torture/ndr

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/torture/ndr/ndr.c (modified) (1 diff)
• source4/torture/ndr/ndr.h (modified) (1 diff)
• source4/torture/ndr/ntprinting.c (copied) (copied from vendor/current/source4/torture/ndr/ntprinting.c )
• source4/torture/ndr/samr.c (modified) (2 diffs)

trunk/server/source4/torture/ndr/ndr.c

@@ -351 +351 @@
         torture_suite_add_suite(suite, ndr_drsuapi_suite(suite));
         torture_suite_add_suite(suite, ndr_spoolss_suite(suite));
+        torture_suite_add_suite(suite, ndr_ntprinting_suite(suite));
         torture_suite_add_suite(suite, ndr_samr_suite(suite));
         torture_suite_add_suite(suite, ndr_drsblobs_suite(suite));

trunk/server/source4/torture/ndr/ndr.h

@@ -44 +44 @@
                 _torture_suite_add_ndr_pull_test(suite, #name, \
                          (ndr_pull_flags_fn_t)ndr_pull_ ## name, data_blob_talloc(suite, data, sizeof(data)), \
-                         sizeof(struct name), 0, (bool (*) (struct torture_context *, void *)) check_fn);
+                         sizeof(struct name), NDR_SCALARS|NDR_BUFFERS, (bool (*) (struct torture_context *, void *)) check_fn);
 
 #define torture_suite_add_ndr_pull_fn_test(suite,name,data,flags,check_fn) \

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

@@ -278 +278 @@
 };
 
+static const uint8_t samr_changepassworduser3_w2k8r2_out_data[] = {
+        0x00, 0x00, 0x02, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x80, 0xa6, 0x0a, 0xff, 0xde, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0xc0
+};
+
+static bool samr_changepassworduser3_w2k8r2_out_check(struct torture_context *tctx,
+                                                      struct samr_ChangePasswordUser3 *r)
+{
+        struct samr_DomInfo1 *dominfo = *r->out.dominfo;
+        struct userPwdChangeFailureInformation *reject = *r->out.reject;
+
+        torture_assert_int_equal(tctx, dominfo->min_password_length, 7, "min_password_length");
+        torture_assert_int_equal(tctx, dominfo->password_history_length, 0, "password_history_length");
+        torture_assert_int_equal(tctx, dominfo->password_properties, DOMAIN_PASSWORD_COMPLEX, "password_properties");
+        torture_assert_u64_equal(tctx, dominfo->max_password_age, 0xffffdeff0aa68000, "max_password_age");
+        torture_assert_u64_equal(tctx, dominfo->min_password_age, 0x0000000000000000, "min_password_age");
+
+        torture_assert_int_equal(tctx, reject->extendedFailureReason, SAM_PWD_CHANGE_NOT_COMPLEX, "extendedFailureReason");
+        torture_assert_int_equal(tctx, reject->filterModuleName.length, 0, "filterModuleName.length");
+        torture_assert_int_equal(tctx, reject->filterModuleName.size, 0, "filterModuleName.size");
+
+        torture_assert_ntstatus_equal(tctx, r->out.result, NT_STATUS_PASSWORD_RESTRICTION, "result");
+
+        return true;
+}
+
 struct torture_suite *ndr_samr_suite(TALLOC_CTX *ctx)
 {
@@ -314 +342 @@
         torture_suite_add_ndr_pull_fn_test(suite, samr_ChangePasswordUser3, samr_changepassworduser3_w2k_out_data, NDR_OUT, NULL);
 #endif
+        torture_suite_add_ndr_pull_fn_test(suite,
+                                           samr_ChangePasswordUser3,
+                                           samr_changepassworduser3_w2k8r2_out_data,
+                                           NDR_OUT,
+                                           samr_changepassworduser3_w2k8r2_out_check);
+
         return suite;
 }