summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2010-04-28 22:46:22 +0200
committerSimo Sorce <idra@samba.org>2010-07-27 10:27:11 -0400
commitc7ae6cb0464ed505fc0d44bb5095bb897c11d458 (patch)
treed6b9d0490a586552ed1be50e8275a6f383136758
parent48828ab154160489586fd07e442739db35103fca (diff)
downloadsamba-c7ae6cb0464ed505fc0d44bb5095bb897c11d458.tar.gz
samba-c7ae6cb0464ed505fc0d44bb5095bb897c11d458.tar.bz2
samba-c7ae6cb0464ed505fc0d44bb5095bb897c11d458.zip
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>
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 99257024c7..198f424c85 100644
--- 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;