Changeset 862 for trunk/server/source3/rpc_server/spoolss

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/rpc_server/spoolss/srv_spoolss_nt.c (modified) (12 diffs)

trunk/server/source3/rpc_server/spoolss/srv_spoolss_nt.c

@@ -1745 +1745 @@
         result = open_printer_hnd(p, r->out.handle, r->in.printername, 0);
         if (!W_ERROR_IS_OK(result)) {
-                DEBUG(0,("_spoolss_OpenPrinterEx: Cannot open a printer handle "
+                DEBUG(3,("_spoolss_OpenPrinterEx: Cannot open a printer handle "
                         "for printer %s\n", r->in.printername));
                 ZERO_STRUCTP(r->out.handle);
@@ -1943 +1943 @@
          */
 
-         if ((Printer->printer_type != SPLHND_SERVER) &&
-             r->in.devmode_ctr.devmode) {
+         if ((Printer->printer_type != SPLHND_SERVER)
+          && (r->in.devmode_ctr.devmode != NULL)) {
                 copy_devicemode(NULL, r->in.devmode_ctr.devmode,
                                 &Printer->devmode);
          }
-
-#if 0   /* JERRY -- I'm doubtful this is really effective */
-        /* HACK ALERT!!! Sleep for 1/3 of a second to try trigger a LAN/WAN
-           optimization in Windows 2000 clients  --jerry */
-
-        if ( (r->in.access_mask == PRINTER_ACCESS_ADMINISTER)
-                && (RA_WIN2K == get_remote_arch()) )
-        {
-                DEBUG(10,("_spoolss_OpenPrinterEx: Enabling LAN/WAN hack for Win2k clients.\n"));
-                sys_usleep( 500000 );
-        }
-#endif
 
         return WERR_OK;
@@ -4038 +4026 @@
         r->averageppm           = info2->averageppm;
 
-        copy_devicemode(mem_ctx, info2->devmode, &r->devmode);
-        if (!r->devmode) {
+        if (info2->devmode != NULL) {
+                result = copy_devicemode(mem_ctx,
+                                         info2->devmode,
+                                         &r->devmode);
+                if (!W_ERROR_IS_OK(result)) {
+                        return result;
+                }
+        } else if (lp_default_devmode(snum)) {
+                result = spoolss_create_default_devmode(mem_ctx,
+                                                        info2->printername,
+                                                        &r->devmode);
+                if (!W_ERROR_IS_OK(result)) {
+                        return result;
+                }
+        } else {
+                r->devmode = NULL;
                 DEBUG(8,("Returning NULL Devicemode!\n"));
         }
@@ -4175 +4177 @@
 {
         struct auth_serversupplied_info *session_info;
-        struct GUID guid;
+        char *printer;
         NTSTATUS status;
-
-        status = make_session_info_system(mem_ctx, &session_info);
+        WERROR werr;
+        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+        if (tmp_ctx == NULL) {
+                return WERR_NOMEM;
+        }
+
+        status = make_session_info_system(tmp_ctx, &session_info);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0, ("construct_printer_info7: "
                           "Could not create system session_info\n"));
-                return WERR_NOMEM;
-        }
-
-        if (is_printer_published(mem_ctx, session_info, msg_ctx,
-                                 servername,
-                                 lp_servicename(snum), &guid, NULL)) {
+                werr = WERR_NOMEM;
+                goto out_tmp_free;
+        }
+
+        printer = lp_servicename(snum);
+        if (printer == NULL) {
+                DEBUG(0, ("invalid printer snum %d\n", snum));
+                werr = WERR_INVALID_PARAM;
+                goto out_tmp_free;
+        }
+
+        if (is_printer_published(tmp_ctx, session_info, msg_ctx,
+                                 servername, printer, NULL)) {
+                struct GUID guid;
+                werr = nt_printer_guid_get(tmp_ctx, session_info, msg_ctx,
+                                           printer, &guid);
+                if (!W_ERROR_IS_OK(werr)) {
+                        goto out_tmp_free;
+                }
                 r->guid = talloc_strdup_upper(mem_ctx, GUID_string2(mem_ctx, &guid));
                 r->action = DSPRINT_PUBLISH;
@@ -4194 +4214 @@
                 r->action = DSPRINT_UNPUBLISH;
         }
-        W_ERROR_HAVE_NO_MEMORY(r->guid);
-
-        TALLOC_FREE(session_info);
-        return WERR_OK;
+        if (r->guid == NULL) {
+                werr = WERR_NOMEM;
+                goto out_tmp_free;
+        }
+
+        werr = WERR_OK;
+out_tmp_free:
+        talloc_free(tmp_ctx);
+        return werr;
 }
 
@@ -4219 +4244 @@
         }
 
-        copy_devicemode(mem_ctx, info2->devmode, &r->devmode);
-        if (!r->devmode) {
+        if (info2->devmode != NULL) {
+                result = copy_devicemode(mem_ctx,
+                                         info2->devmode,
+                                         &r->devmode);
+                if (!W_ERROR_IS_OK(result)) {
+                        return result;
+                }
+        } else if (lp_default_devmode(snum)) {
+                result = spoolss_create_default_devmode(mem_ctx,
+                                                        info2->printername,
+                                                        &r->devmode);
+                if (!W_ERROR_IS_OK(result)) {
+                        return result;
+                }
+        } else {
+                r->devmode = NULL;
                 DEBUG(8,("Returning NULL Devicemode!\n"));
         }
@@ -4427 +4466 @@
         DEBUG(4,("enum_all_printers_info_1_name\n"));
 
-        if ((servername[0] == '\\') && (servername[1] == '\\')) {
+        if (servername != NULL &&
+            (servername[0] == '\\') && (servername[1] == '\\')) {
                 s = servername + 2;
         }
@@ -4462 +4502 @@
            WERR_CAN_NOT_COMPLETE so we should do the same. */
 
-        if (servername[0] == '\\' && servername[1] == '\\') {
+        if (servername != NULL &&
+            (servername[0] == '\\') && (servername[1] == '\\')) {
                  s = servername + 2;
         }
@@ -5592 +5633 @@
         struct printer_handle *printer;
         WERROR result;
+        uint32_t version = r->in.client_major_version;
 
         int snum;
@@ -5614 +5656 @@
         if (!get_printer_snum(p, r->in.handle, &snum, NULL)) {
                 return WERR_BADFID;
+        }
+
+        if (r->in.client_major_version == SPOOLSS_DRIVER_VERSION_2012) {
+                DEBUG(3,("_spoolss_GetPrinterDriver2: v4 driver requested, "
+                        "downgrading to v3\n"));
+                version = SPOOLSS_DRIVER_VERSION_200X;
         }
 
@@ -5622 +5670 @@
                                                      snum, printer->servername,
                                                      r->in.architecture,
-                                                     r->in.client_major_version);
+                                                     version);
         if (!W_ERROR_IS_OK(result)) {
                 TALLOC_FREE(r->out.info);
@@ -5722 +5770 @@
 
         if (info_1->datatype) {
-                if (strcmp(info_1->datatype, "RAW") != 0) {
+                /*
+                 * The v4 driver model used in Windows 8 declares print jobs
+                 * intended to bypass the XPS processing layer by setting
+                 * datatype to "XPS_PASS" instead of "RAW".
+                 */
+                if ((strcmp(info_1->datatype, "RAW") != 0)
+                 && (strcmp(info_1->datatype, "XPS_PASS") != 0)) {
                         *r->out.job_id = 0;
                         return WERR_INVALID_DATATYPE;