summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-10-09 18:55:35 +0000
committerGerald Carter <jerry@samba.org>2002-10-09 18:55:35 +0000
commit9c25d8907088ef35eef396df5a13074f445adacd (patch)
tree136671149bfe2d7f8b72762ea1a301117cbc07fc
parentd45a623666a9f02d02009b3b8cd093de62577fec (diff)
downloadsamba-9c25d8907088ef35eef396df5a13074f445adacd.tar.gz
samba-9c25d8907088ef35eef396df5a13074f445adacd.tar.bz2
samba-9c25d8907088ef35eef396df5a13074f445adacd.zip
print job properties fix from APP_HEAD. a null devmode is not a failure.
(This used to be commit 8f95773e0ab0c5e0854d9e442170e25280279bfb)
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index a1eb99cb32..c5d46abe57 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6017,11 +6017,9 @@ static WERROR enumjobs_level2(print_queue_struct *queue, int snum,
goto done;
}
- if (!(devmode = construct_dev_mode(snum))) {
- *returned = 0;
- result = WERR_NOMEM;
- goto done;
- }
+ /* this should not be a failure condition if the devmode is NULL */
+
+ devmode = construct_dev_mode(snum);
for (i=0; i<*returned; i++)
fill_job_info_2(&(info[i]), &queue[i], i, snum, ntprinter,
@@ -8122,7 +8120,8 @@ static WERROR getjob_level_2(print_queue_struct *queue, int count, int snum, uin
/*
* if the print job does not have a DEVMODE associated with it,
- * just use the one for the printer
+ * just use the one for the printer. A NULL devicemode is not
+ * a failure condition
*/
if ( !(nt_devmode=print_job_devmode( snum, jobid )) )
@@ -8134,11 +8133,6 @@ static WERROR getjob_level_2(print_queue_struct *queue, int count, int snum, uin
}
}
- if ( !devmode ) {
- ret = WERR_NOMEM;
- goto done;
- }
-
fill_job_info_2(info_2, &(queue[i-1]), i, snum, ntprinter, devmode);
*needed += spoolss_size_job_info_2(info_2);