Changeset 746 for vendor/current/source4

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

Location:

vendor/current/source4

Files:

• auth/credentials/credentials_ntlm.c (modified) (1 diff)
• dsdb/samdb/ldb_modules/password_hash.c (modified) (1 diff)
• lib/ldb/common/ldb_parse.c (modified) (3 diffs)
• libcli/raw/smb_signing.c (modified) (2 diffs)
• libnet/libnet_passwd.c (modified) (2 diffs)
• ntp_signd/ntp_signd.c (modified) (1 diff)
• rpc_server/samr/samr_password.c (modified) (1 diff)
• torture/ndr/ndr.c (modified) (1 diff)
• torture/ndr/ndr.h (modified) (1 diff)
• torture/ndr/samr.c (modified) (2 diffs)
• torture/ntp/ntp_signd.c (modified) (1 diff)
• torture/rpc/samba3rpc.c (modified) (1 diff)
• torture/rpc/samlogon.c (modified) (1 diff)
• torture/rpc/samr.c (modified) (4 diffs)
• torture/rpc/spoolss.c (modified) (11 diffs)
• torture/smb2/compound.c (modified) (10 diffs)
• torture/smb2/connect.c (modified) (1 diff)
• torture/smb2/oplock.c (modified) (2 diffs)
• torture/smb2/read.c (modified) (2 diffs)
• torture/wscript_build (modified) (1 diff)

vendor/current/source4/auth/credentials/credentials_ntlm.c

@@ -111 +111 @@
                 *flags &= ~CLI_CRED_LANMAN_AUTH;
         } else if (*flags & CLI_CRED_NTLM2) {
-                struct MD5Context md5_session_nonce_ctx;
+                MD5_CTX md5_session_nonce_ctx;
                 uint8_t session_nonce[16];
                 uint8_t session_nonce_hash[16];

vendor/current/source4/dsdb/samdb/ldb_modules/password_hash.c

@@ -1352 +1352 @@
 
         for (i=0; i < ARRAY_SIZE(wdigest); i++) {
-                struct MD5Context md5;
+                MD5_CTX md5;
                 MD5Init(&md5);
                 if (wdigest[i].nt4dom) {

vendor/current/source4/lib/ldb/common/ldb_parse.c

@@ -112 +112 @@
 }
 
+static bool need_encode(unsigned char cval)
+{
+        if (cval < 0x20 || cval > 0x7E || strchr(" *()\\&|!\"", cval)) {
+                return true;
+        }
+        return false;
+}
 
 /*
@@ -125 +132 @@
 
         for (i=0;i<val.length;i++) {
-                if (!isprint(buf[i]) || strchr(" *()\\&|!\"", buf[i])) {
+                if (need_encode(buf[i])) {
                         len += 2;
                 }
@@ -134 +141 @@
         len = 0;
         for (i=0;i<val.length;i++) {
-                if (!isprint(buf[i]) || strchr(" *()\\&|!\"", buf[i])) {
+                if (need_encode(buf[i])) {
                         snprintf(ret+len, 4, "\\%02X", buf[i]);
                         len += 3;

vendor/current/source4/libcli/raw/smb_signing.c

@@ -104 +104 @@
 {
         uint8_t calc_md5_mac[16];
-        struct MD5Context md5_ctx;
+        MD5_CTX md5_ctx;
 
         /*
@@ -139 +139 @@
         uint8_t *server_sent_mac;
         uint8_t sequence_buf[8];
-        struct MD5Context md5_ctx;
+        MD5_CTX md5_ctx;
         const size_t offset_end_of_sig = (HDR_SS_FIELD + 8);
         int i;

vendor/current/source4/libnet/libnet_passwd.c

@@ -275 +275 @@
         DATA_BLOB confounded_session_key = data_blob_talloc(mem_ctx, NULL, 16);
         uint8_t confounder[16]; 
-        struct MD5Context md5;
+        MD5_CTX md5;
 
         if (r->samr_handle.in.info21) {
@@ -331 +331 @@
         DATA_BLOB confounded_session_key = data_blob_talloc(mem_ctx, NULL, 16);
         uint8_t confounder[16]; 
-        struct MD5Context md5;
+        MD5_CTX md5;
 
         if (!r->samr_handle.in.info21) {

vendor/current/source4/ntp_signd/ntp_signd.c

@@ -108 +108 @@
         struct ldb_result *res;
         const char *attrs[] = { "unicodePwd", "userAccountControl", "cn", NULL };
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         struct samr_Password *nt_hash;
         uint32_t user_account_control;

vendor/current/source4/rpc_server/samr/samr_password.c

@@ -545 +545 @@
         DATA_BLOB co_session_key;
         DATA_BLOB session_key = data_blob(NULL, 0);
-        struct MD5Context ctx;
+        MD5_CTX ctx;
 
         nt_status = dcesrv_fetch_session_key(dce_call->conn, &session_key);

vendor/current/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));

vendor/current/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) \

vendor/current/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;
 }

vendor/current/source4/torture/ntp/ntp_signd.c

@@ -79 +79 @@
         int sys_errno;
 
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         uint8_t sig[16];
         enum ndr_err_code ndr_err;

vendor/current/source4/torture/rpc/samba3rpc.c

@@ -775 +775 @@
                 DATA_BLOB confounded_session_key = data_blob_talloc(
                         mem_ctx, NULL, 16);
-                struct MD5Context ctx;
+                MD5_CTX ctx;
                 uint8_t confounder[16];
 

vendor/current/source4/torture/rpc/samlogon.c

@@ -1076 +1076 @@
         uint8_t client_chall[8];
 
-        struct MD5Context md5_session_nonce_ctx;
+        MD5_CTX md5_session_nonce_ctx;
         HMACMD5Context hmac_ctx;
 

vendor/current/source4/torture/rpc/samr.c

@@ -772 +772 @@
         char *newpass;
         struct dcerpc_binding_handle *b = p->binding_handle;
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         struct samr_GetUserPwInfo pwp;
         struct samr_PwInfo info;
@@ -857 +857 @@
         DATA_BLOB session_key;
         DATA_BLOB confounded_session_key = data_blob_talloc(tctx, NULL, 16);
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         uint8_t confounder[16];
         char *newpass;
@@ -1141 +1141 @@
         DATA_BLOB session_key;
         DATA_BLOB confounded_session_key = data_blob_talloc(tctx, NULL, 16);
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         uint8_t confounder[16];
         char *newpass;
@@ -2459 +2459 @@
         DATA_BLOB confounded_session_key = data_blob_talloc(tctx, NULL, 16);
         uint8_t confounder[16];
-        struct MD5Context ctx;
+        MD5_CTX ctx;
 
         bool ret = true;

vendor/current/source4/torture/rpc/spoolss.c

@@ -36 +36 @@
 #include "libcli/raw/raw_proto.h"
 #include "libcli/resolve/resolve.h"
+#include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 #include "lib/cmdline/popt_common.h"
 #include "system/filesys.h"
 #include "torture/ndr/ndr.h"
+#include "torture/smb2/proto.h"
 
 #define TORTURE_WELLKNOWN_PRINTER       "torture_wkn_printer"
@@ -50 +53 @@
 #define TORTURE_DRIVER_ADOBE_CUPSADDSMB "torture_driver_adobe_cupsaddsmb"
 #define TORTURE_DRIVER_TIMESTAMPS       "torture_driver_timestamps"
+#define TORTURE_DRIVER_DELETER          "torture_driver_deleter"
+#define TORTURE_DRIVER_DELETERIN        "torture_driver_deleterin"
+#define TORTURE_PRINTER_STATIC1         "print1"
 
 #define TOP_LEVEL_PRINT_KEY "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print"
@@ -5498 +5504 @@
         TEST_SET_SZ("description", comment, "newval");
         TEST_SET_SZ("location", location, "newval");
+        TEST_SET_SZ("driverName", drivername, "newval");
 /*      TEST_SET_DWORD("priority", priority, 25); */
 
@@ -7724 +7731 @@
 }
 
-static bool test_printer_sd(struct torture_context *tctx,
-                            void *private_data)
+/* use smbd file IO to spool a print job */
+static bool test_print_test_smbd(struct torture_context *tctx,
+                                 void *private_data)
 {
         struct torture_printer_context *t =
@@ -7731 +7739 @@
         struct dcerpc_pipe *p = t->spoolss_pipe;
         struct dcerpc_binding_handle *b = p->binding_handle;
-
-        torture_assert(tctx,
-                test_PrinterInfo_SD(tctx, b, &t->handle),
-                "failed to test security descriptors");
-
-        return true;
-}
-
-static bool test_printer_dm(struct torture_context *tctx,
+        NTSTATUS status;
+        uint32_t count;
+        union spoolss_JobInfo *info = NULL;
+        int i;
+
+        struct smb2_tree *tree;
+        struct smb2_handle job_h;
+        struct cli_credentials *credentials = cmdline_credentials;
+        struct smbcli_options options;
+        TALLOC_CTX *mem_ctx = talloc_new(tctx);
+        /*
+         * Do not test against the dynamically added printers, printing via
+         * smbd means that a different spoolss process may handle the
+         * OpenPrinter request to the one that handled the AddPrinter request.
+         * This currently leads to an ugly race condition where one process
+         * sees the new printer and one doesn't.
+         */
+        const char *share = TORTURE_PRINTER_STATIC1;
+
+        torture_comment(tctx, "Testing smbd job spooling\n");
+        lpcfg_smbcli_options(tctx->lp_ctx, &options);
+
+        status = smb2_connect(tctx,
+                              torture_setting_string(tctx, "host", NULL),
+                              lpcfg_smb_ports(tctx->lp_ctx),
+                              share,
+                              lpcfg_resolve_context(tctx->lp_ctx),
+                              credentials,
+                              &tree,
+                              tctx->ev,
+                              &options,
+                              lpcfg_socket_options(tctx->lp_ctx),
+                              lpcfg_gensec_settings(tctx, tctx->lp_ctx));
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Failed to connect to SMB2 printer %s - %s\n",
+                       share, nt_errstr(status));
+                return false;
+        }
+
+        status = torture_smb2_testfile(tree, "smbd_spooler_job", &job_h);
+        torture_assert_ntstatus_ok(tctx, status, "smbd spool job create");
+
+        status = smb2_util_write(tree, job_h, "exciting print job data", 0,
+                                 sizeof("exciting print job data"));
+        torture_assert_ntstatus_ok(tctx, status, "smbd spool job write");
+
+        /* check back end spoolss job was created */
+        torture_assert(tctx,
+                test_EnumJobs_args(tctx, b, &t->handle, 1, &count, &info),
+                "EnumJobs level 1 failed");
+
+        for (i = 0; i < count; i++) {
+                if (!strcmp(info[i].info1.document_name, "smbd_spooler_job")) {
+                        break;
+                }
+        }
+        torture_assert(tctx, (i != count), "smbd_spooler_job not found");
+
+        status = smb2_util_close(tree, job_h);
+        torture_assert_ntstatus_ok(tctx, status, "smbd spool job close");
+
+        /* disconnect from printer share */
+        talloc_free(mem_ctx);
+
+        return true;
+}
+
+static bool test_printer_sd(struct torture_context *tctx,
                             void *private_data)
-{
-        struct torture_printer_context *t =
-                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
-        struct dcerpc_pipe *p = t->spoolss_pipe;
-
-        torture_assert(tctx,
-                test_PrinterInfo_DevMode(tctx, p, &t->handle, t->info2.printername, t->devmode),
-                "failed to test devicemodes");
-
-        return true;
-}
-
-static bool test_printer_info_winreg(struct torture_context *tctx,
-                                     void *private_data)
-{
-        struct torture_printer_context *t =
-                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
-        struct dcerpc_pipe *p = t->spoolss_pipe;
-
-        torture_assert(tctx,
-                test_PrinterInfo_winreg(tctx, p, &t->handle, t->info2.printername),
-                "failed to test printer info winreg");
-
-        return true;
-}
-
-static bool test_printer_change_id(struct torture_context *tctx,
-                                   void *private_data)
-{
-        struct torture_printer_context *t =
-                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
-        struct dcerpc_pipe *p = t->spoolss_pipe;
-
-        torture_assert(tctx,
-                test_ChangeID(tctx, p, &t->handle),
-                "failed to test change id");
-
-        return true;
-}
-
-static bool test_printer_keys(struct torture_context *tctx,
-                              void *private_data)
 {
         struct torture_printer_context *t =
@@ -7790 +7815 @@
 
         torture_assert(tctx,
+                test_PrinterInfo_SD(tctx, b, &t->handle),
+                "failed to test security descriptors");
+
+        return true;
+}
+
+static bool test_printer_dm(struct torture_context *tctx,
+                            void *private_data)
+{
+        struct torture_printer_context *t =
+                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+        struct dcerpc_pipe *p = t->spoolss_pipe;
+
+        torture_assert(tctx,
+                test_PrinterInfo_DevMode(tctx, p, &t->handle, t->info2.printername, t->devmode),
+                "failed to test devicemodes");
+
+        return true;
+}
+
+static bool test_printer_info_winreg(struct torture_context *tctx,
+                                     void *private_data)
+{
+        struct torture_printer_context *t =
+                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+        struct dcerpc_pipe *p = t->spoolss_pipe;
+
+        torture_assert(tctx,
+                test_PrinterInfo_winreg(tctx, p, &t->handle, t->info2.printername),
+                "failed to test printer info winreg");
+
+        return true;
+}
+
+static bool test_printer_change_id(struct torture_context *tctx,
+                                   void *private_data)
+{
+        struct torture_printer_context *t =
+                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+        struct dcerpc_pipe *p = t->spoolss_pipe;
+
+        torture_assert(tctx,
+                test_ChangeID(tctx, p, &t->handle),
+                "failed to test change id");
+
+        return true;
+}
+
+static bool test_printer_keys(struct torture_context *tctx,
+                              void *private_data)
+{
+        struct torture_printer_context *t =
+                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+        struct dcerpc_pipe *p = t->spoolss_pipe;
+        struct dcerpc_binding_handle *b = p->binding_handle;
+
+        torture_assert(tctx,
                 test_printer_all_keys(tctx, b, &t->handle),
                 "failed to test printer keys");
@@ -7905 +7987 @@
         torture_tcase_add_simple_test(tcase, "print_test", test_print_test);
         torture_tcase_add_simple_test(tcase, "print_test_extended", test_print_test_extended);
+        torture_tcase_add_simple_test(tcase, "print_test_smbd", test_print_test_smbd);
         torture_tcase_add_simple_test(tcase, "printer_info", test_printer_info);
         torture_tcase_add_simple_test(tcase, "sd", test_printer_sd);
@@ -8923 +9006 @@
 }
 
+static bool check_printer_driver_file(struct torture_context *tctx,
+                                      struct smbcli_state *cli,
+                                      struct torture_driver_context *d,
+                                      const char *file_name)
+{
+        const char *remote_arch_dir = driver_directory_dir(d->remote.driver_directory);
+        const char *remote_name = talloc_asprintf(tctx, "%s\\%d\\%s",
+                                                  remote_arch_dir,
+                                                  d->info8.version,
+                                                  file_name);
+        int fnum;
+
+        torture_assert(tctx, (file_name && strlen(file_name) != 0), "invalid filename");
+
+        torture_comment(tctx, "checking for driver file at %s\n", remote_name);
+
+        fnum = smbcli_open(cli->tree, remote_name, O_RDONLY, DENY_NONE);
+        if (fnum == -1) {
+                return false;
+        }
+
+        torture_assert_ntstatus_ok(tctx,
+                smbcli_close(cli->tree, fnum),
+                "failed to close driver file");
+
+        return true;
+}
+
+static bool check_printer_driver_files(struct torture_context *tctx,
+                                       const char *server_name,
+                                       struct torture_driver_context *d,
+                                       bool expect_exist)
+{
+        struct smbcli_state *cli;
+        const char *share_name = driver_directory_share(tctx, d->remote.driver_directory);
+        int i;
+
+        torture_assert(tctx,
+                connect_printer_driver_share(tctx, server_name, share_name, &cli),
+                "failed to connect to driver share");
+
+        torture_comment(tctx, "checking %sexistent driver files at \\\\%s\\%s\n",
+                        (expect_exist ? "": "non-"),
+                        server_name, share_name);
+
+        if (d->info8.driver_path && d->info8.driver_path[0]) {
+                torture_assert(tctx,
+                        check_printer_driver_file(tctx, cli, d, d->info8.driver_path) == expect_exist,
+                        "failed driver_path check");
+        }
+        if (d->info8.data_file && d->info8.data_file[0]) {
+                torture_assert(tctx,
+                        check_printer_driver_file(tctx, cli, d, d->info8.data_file) == expect_exist,
+                        "failed data_file check");
+        }
+        if (d->info8.config_file && d->info8.config_file[0]) {
+                torture_assert(tctx,
+                        check_printer_driver_file(tctx, cli, d, d->info8.config_file) == expect_exist,
+                        "failed config_file check");
+        }
+        if (d->info8.help_file && d->info8.help_file[0]) {
+                torture_assert(tctx,
+                        check_printer_driver_file(tctx, cli, d, d->info8.help_file) == expect_exist,
+                        "failed help_file check");
+        }
+        if (d->info8.dependent_files) {
+                for (i=0; d->info8.dependent_files->string && d->info8.dependent_files->string[i] != NULL; i++) {
+                        torture_assert(tctx,
+                                check_printer_driver_file(tctx, cli, d, d->info8.dependent_files->string[i]) == expect_exist,
+                                "failed dependent_files check");
+                }
+        }
+
+        talloc_free(cli);
+
+        return true;
+}
+
 static bool remove_printer_driver_file(struct torture_context *tctx,
                                        struct smbcli_state *cli,
@@ -9207 +9368 @@
         struct torture_driver_context *d;
 
+        if (!torture_setting_bool(tctx, "samba3", false)) {
+                torture_skip(tctx, "skipping adobe test which only works against samba3");
+        }
+
         d = talloc_zero(tctx, struct torture_driver_context);
 
@@ -9372 +9537 @@
 }
 
+static bool test_del_driver_all_files(struct torture_context *tctx,
+                                      struct dcerpc_pipe *p)
+{
+        struct torture_driver_context *d;
+        struct spoolss_StringArray *a;
+        uint32_t add_flags = APD_COPY_NEW_FILES;
+        uint32_t delete_flags = DPD_DELETE_ALL_FILES;
+        struct dcerpc_binding_handle *b = p->binding_handle;
+        const char *server_name_slash = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+
+        d = talloc_zero(tctx, struct torture_driver_context);
+
+        d->ex                           = true;
+        d->info8.version                = SPOOLSS_DRIVER_VERSION_200X;
+        d->info8.driver_name            = TORTURE_DRIVER_DELETER;
+        d->info8.architecture           = NULL;
+        d->info8.driver_path            = talloc_strdup(d, "pscript5.dll");
+        d->info8.data_file              = talloc_strdup(d, "cups6.ppd");
+        d->info8.config_file            = talloc_strdup(d, "cupsui6.dll");
+        d->info8.help_file              = talloc_strdup(d, "pscript.hlp");
+        d->local.environment            = talloc_strdup(d, SPOOLSS_ARCHITECTURE_x64);
+        d->local.driver_directory       = talloc_strdup(d, "/usr/share/cups/drivers/x64");
+
+        a                               = talloc_zero(d, struct spoolss_StringArray);
+        a->string                       = talloc_zero_array(a, const char *, 3);
+        a->string[0]                    = talloc_strdup(a->string, "cups6.inf");
+        a->string[1]                    = talloc_strdup(a->string, "cups6.ini");
+
+        d->info8.dependent_files        = a;
+        d->info8.architecture           = d->local.environment;
+
+        torture_assert(tctx,
+                fillup_printserver_info(tctx, p, d),
+                "failed to fillup printserver info");
+
+        if (!directory_exist(d->local.driver_directory)) {
+                torture_skip(tctx, "Skipping Printer Driver test as no local driver is available");
+        }
+
+        torture_assert(tctx,
+                upload_printer_driver(tctx, dcerpc_server_name(p), d),
+                "failed to upload printer driver");
+
+        torture_assert(tctx,
+                test_AddPrinterDriver_args_level_3(tctx, b, server_name_slash, &d->info8, add_flags, true, NULL),
+                "failed to add driver");
+
+        torture_assert(tctx,
+                test_DeletePrinterDriverEx(tctx, b, server_name_slash,
+                                           d->info8.driver_name,
+                                           d->local.environment,
+                                           delete_flags,
+                                           d->info8.version),
+                "failed to delete driver");
+
+        torture_assert(tctx,
+                check_printer_driver_files(tctx, dcerpc_server_name(p), d, false),
+                "printer driver file check failed");
+
+        talloc_free(d);
+        return true;
+}
+
+static bool test_del_driver_unused_files(struct torture_context *tctx,
+                                         struct dcerpc_pipe *p)
+{
+        struct torture_driver_context *d1;
+        struct torture_driver_context *d2;
+        uint32_t add_flags = APD_COPY_NEW_FILES;
+        struct dcerpc_binding_handle *b = p->binding_handle;
+        const char *server_name_slash = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+
+        d1 = talloc_zero(tctx, struct torture_driver_context);
+        d1->ex                          = true;
+        d1->info8.version               = SPOOLSS_DRIVER_VERSION_200X;
+        d1->info8.driver_name           = TORTURE_DRIVER_DELETER;
+        d1->info8.architecture          = NULL;
+        d1->info8.driver_path           = talloc_strdup(d1, "pscript5.dll");
+        d1->info8.data_file             = talloc_strdup(d1, "cups6.ppd");
+        d1->info8.config_file           = talloc_strdup(d1, "cupsui6.dll");
+        d1->info8.help_file             = talloc_strdup(d1, "pscript.hlp");
+        d1->local.environment           = talloc_strdup(d1, SPOOLSS_ARCHITECTURE_x64);
+        d1->local.driver_directory      = talloc_strdup(d1, "/usr/share/cups/drivers/x64");
+        d1->info8.architecture          = d1->local.environment;
+
+        d2 = talloc_zero(tctx, struct torture_driver_context);
+        d2->ex                          = true;
+        d2->info8.version               = SPOOLSS_DRIVER_VERSION_200X;
+        d2->info8.driver_name           = TORTURE_DRIVER_DELETERIN;
+        d2->info8.architecture          = NULL;
+        d2->info8.driver_path           = talloc_strdup(d2, "pscript5.dll");    /* overlapping */
+        d2->info8.data_file             = talloc_strdup(d2, "cupsps6.dll");
+        d2->info8.config_file           = talloc_strdup(d2, "cups6.ini");
+        d2->info8.help_file             = talloc_strdup(d2, "pscript.hlp");     /* overlapping */
+        d2->local.environment           = talloc_strdup(d2, SPOOLSS_ARCHITECTURE_x64);
+        d2->local.driver_directory      = talloc_strdup(d2, "/usr/share/cups/drivers/x64");
+        d2->info8.architecture          = d2->local.environment;
+
+        torture_assert(tctx,
+                fillup_printserver_info(tctx, p, d1),
+                "failed to fillup printserver info");
+        torture_assert(tctx,
+                fillup_printserver_info(tctx, p, d2),
+                "failed to fillup printserver info");
+
+        if (!directory_exist(d1->local.driver_directory)) {
+                torture_skip(tctx, "Skipping Printer Driver test as no local driver is available");
+        }
+
+        torture_assert(tctx,
+                upload_printer_driver(tctx, dcerpc_server_name(p), d1),
+                "failed to upload printer driver");
+        torture_assert(tctx,
+                test_AddPrinterDriver_args_level_3(tctx, b, server_name_slash, &d1->info8, add_flags, true, NULL),
+                "failed to add driver");
+
+        torture_assert(tctx,
+                upload_printer_driver(tctx, dcerpc_server_name(p), d2),
+                "failed to upload printer driver");
+        torture_assert(tctx,
+                test_AddPrinterDriver_args_level_3(tctx, b, server_name_slash, &d2->info8, add_flags, true, NULL),
+                "failed to add driver");
+
+        /* some files are in use by a separate driver, should fail */
+        torture_assert(tctx,
+                test_DeletePrinterDriverEx_exp(tctx, b, server_name_slash,
+                                               d1->info8.driver_name,
+                                               d1->local.environment,
+                                               DPD_DELETE_ALL_FILES,
+                                               d1->info8.version,
+                                               WERR_PRINTER_DRIVER_IN_USE),
+                "invalid delete driver response");
+
+        /* should only delete files not in use by other driver */
+        torture_assert(tctx,
+                test_DeletePrinterDriverEx_exp(tctx, b, server_name_slash,
+                                               d1->info8.driver_name,
+                                               d1->local.environment,
+                                               DPD_DELETE_UNUSED_FILES,
+                                               d1->info8.version,
+                                               WERR_OK),
+                "failed to delete driver (unused files)");
+
+        /* check non-overlapping were deleted */
+        d1->info8.driver_path = NULL;
+        d1->info8.help_file = NULL;
+        torture_assert(tctx,
+                check_printer_driver_files(tctx, dcerpc_server_name(p), d1, false),
+                "printer driver file check failed");
+        /* d2 files should be uneffected */
+        torture_assert(tctx,
+                check_printer_driver_files(tctx, dcerpc_server_name(p), d2, true),
+                "printer driver file check failed");
+
+        torture_assert(tctx,
+                test_DeletePrinterDriverEx_exp(tctx, b, server_name_slash,
+                                               d2->info8.driver_name,
+                                               d2->local.environment,
+                                               DPD_DELETE_ALL_FILES,
+                                               d2->info8.version,
+                                               WERR_OK),
+                "failed to delete driver");
+
+        torture_assert(tctx,
+                check_printer_driver_files(tctx, dcerpc_server_name(p), d2, false),
+                "printer driver file check failed");
+
+        talloc_free(d1);
+        talloc_free(d2);
+        return true;
+}
+
 struct torture_suite *torture_rpc_spoolss_driver(TALLOC_CTX *mem_ctx)
 {
@@ -9392 +9729 @@
         torture_rpc_tcase_add_test(tcase, "multiple_drivers", test_multiple_drivers);
 
+        torture_rpc_tcase_add_test(tcase, "del_driver_all_files", test_del_driver_all_files);
+
+        torture_rpc_tcase_add_test(tcase, "del_driver_unused_files", test_del_driver_unused_files);
+
         return suite;
 }

vendor/current/source4/torture/smb2/compound.c

@@ -33 +33 @@
                 goto done; \
         }} while (0)
-
-#define TARGET_IS_W2K8(_tctx) (torture_setting_bool(_tctx, "w2k8", false))
-#define TARGET_IS_WIN7(_tctx) (torture_setting_bool(_tctx, "win7", false))
 
 static bool test_compound_related1(struct torture_context *tctx,
@@ -167 +164 @@
         CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
         status = smb2_close_recv(req[3], &cl);
-        CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
         status = smb2_close_recv(req[4], &cl);
-        CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 
         tree->tid = saved_tid;
@@ -253 +250 @@
         struct smb2_close cl;
         bool ret = true;
-        struct smb2_request *req[2];
-
-        smb2_transport_credits_ask_num(tree->session->transport, 2);
+        struct smb2_request *req[3];
+
+        smb2_transport_credits_ask_num(tree->session->transport, 3);
 
         smb2_util_unlink(tree, fname);
@@ -279 +276 @@
         cr.in.fname                     = fname;
 
-        smb2_transport_compound_start(tree->session->transport, 2);
+        smb2_transport_compound_start(tree->session->transport, 3);
 
         /* passing the first request with the related flag is invalid */
@@ -292 +289 @@
         cl.in.file.handle = hd;
         req[1] = smb2_close_send(tree, &cl);
+
+        smb2_transport_compound_set_related(tree->session->transport, false);
+        req[2] = smb2_close_send(tree, &cl);
 
         status = smb2_create_recv(req[0], tree, &cr);
@@ -298 +298 @@
         status = smb2_close_recv(req[1], &cl);
         CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+        status = smb2_close_recv(req[2], &cl);
+        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 
         smb2_util_unlink(tree, fname);
@@ -368 +370 @@
         CHECK_STATUS(status, NT_STATUS_OK);
         status = smb2_close_recv(req[2], &cl);
-        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
+        CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED);
         status = smb2_close_recv(req[3], &cl);
-        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
+        CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED);
         status = smb2_close_recv(req[4], &cl);
         CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
@@ -440 +442 @@
         CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
         status = smb2_close_recv(req[3], &cl);
-        CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
         status = smb2_close_recv(req[4], &cl);
-        CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 
         smb2_util_unlink(tree, fname);
@@ -466 +468 @@
      * SMB2 spec as noted in MS-SMB2 <159>, <162>.  This, test currently
      * verifies the Windows behavior, not the general spec behavior. */
-    if (!TARGET_IS_WIN7(tctx) && !TARGET_IS_W2K8(tctx)) {
-            torture_skip(tctx, "Interim test is specific to Windows server "
-                               "behavior.\n");
-    }
 
     smb2_transport_credits_ask_num(tree->session->transport, 5);
@@ -537 +535 @@
      * SMB2 spec as noted in MS-SMB2 <159>, <162>.  This, test currently
      * verifies the Windows behavior, not the general spec behavior. */
-    if (!TARGET_IS_WIN7(tctx) && !TARGET_IS_W2K8(tctx)) {
-            torture_skip(tctx, "Interim test is specific to Windows server "
-                               "behavior.\n");
-    }
 
     smb2_transport_credits_ask_num(tree->session->transport, 5);

vendor/current/source4/torture/smb2/connect.c

@@ -72 +72 @@
         DATA_BLOB data;
         int i;
+        uint32_t size = torture_setting_int(tctx, "smb2maxwrite", 64*1024);
         
-        if (torture_setting_bool(tctx, "dangerous", false)) {
-                data = data_blob_talloc(tree, NULL, 160000);
-        } else if (torture_setting_bool(tctx, "samba4", false)) {
-                data = data_blob_talloc(tree, NULL, UINT16_MAX);
-        } else {
-                data = data_blob_talloc(tree, NULL, torture_setting_int(tctx, "smb2maxwrite", 120000));
-        }
+        data = data_blob_talloc(tree, NULL, size);
+        if (size != data.length) {
+                printf("data_blob_talloc(%s) failed\n", size);
+                return NT_STATUS_NO_MEMORY;
+        }
+
         for (i=0;i<data.length;i++) {
                 data.data[i] = i;

vendor/current/source4/torture/smb2/oplock.c

@@ -2385 +2385 @@
         int te;
 
-        if (torture_setting_bool(tctx, "samba3", false)) {
-                torture_skip(tctx, "BATCH22 disabled against samba3\n");
-        }
-
         status = torture_smb2_testdir(tree1, BASEDIR, &h);
         torture_assert_ntstatus_ok(tctx, status, "Error creating directory");
@@ -2727 +2723 @@
                 {&fname_default_stream, true,  SMB2_OPLOCK_LEVEL_EXCLUSIVE, SMB2_OPLOCK_LEVEL_II},
         };
-
-        /* Only passes against windows at the moment. */
-        if (torture_setting_bool(tctx, "samba3", false) ||
-            torture_setting_bool(tctx, "samba4", false)) {
-                torture_skip(tctx, "STREAM1 disabled against samba3+4\n");
-        }
 
         fname_stream = talloc_asprintf(tctx, "%s:%s", fname_base, stream);

vendor/current/source4/torture/smb2/read.c

@@ -52 +52 @@
         NTSTATUS status;
         struct smb2_handle h;
-        uint8_t buf[70000];
+        uint8_t buf[64*1024];
         struct smb2_read rd;
         TALLOC_CTX *tmp_ctx = talloc_new(tree);
@@ -135 +135 @@
         NTSTATUS status;
         struct smb2_handle h;
-        uint8_t buf[70000];
+        uint8_t buf[64*1024];
         struct smb2_read rd;
         TALLOC_CTX *tmp_ctx = talloc_new(tree);

vendor/current/source4/torture/wscript_build

@@ -34 +34 @@
 
 bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
-        source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c ndr/backupkey.c',
+        source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/ntprinting.c ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c ndr/backupkey.c',
         autoproto='ndr/proto.h',
         deps='torture'