s3-spoolss: Don't return the printer devicemode in spoolss_EnumJobs.

Jobs have their own DeviceMode, see print_job_devmode().

Signed-off-by: Jim McDonough <jmcd@samba.org>

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 99257024c76c10d5301775cd083ce126423159b1..198f424c8547a09249d95edddb9c8086fb4c446b 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6202,7 +6202,6 @@ static WERROR enumjobs_level2(TALLOC_CTX *mem_ctx,
                              union spoolss_JobInfo **info_p,
                              uint32_t *count)
 {
-       struct spoolss_DeviceMode *devmode;
        union spoolss_JobInfo *info;
        int i;
        WERROR result = WERR_OK;
@@ -6213,16 +6212,11 @@ static WERROR enumjobs_level2(TALLOC_CTX *mem_ctx,
        *count = num_queues;
 
        for (i=0; i<*count; i++) {
+               struct spoolss_DeviceMode *devmode;
 
-               if (!pinfo2->devmode) {
-                       result = spoolss_create_default_devmode(info,
+               result = spoolss_create_default_devmode(info,
                                                        pinfo2->printername,
                                                        &devmode);
-               } else {
-                       result = copy_devicemode(info,
-                                                pinfo2->devmode,
-                                                &devmode);
-               }
                if (!W_ERROR_IS_OK(result)) {
                        DEBUG(3, ("Can't proceed w/o a devmode!"));
                        goto out;