print job properties fix from APP_HEAD. a null devmode is not a failure.

(This used to be commit b507dba452ecbd96ec95242f761501d0c5e0d7b5)

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index a1eb99cb32176dc94e918f93740eb7832815f8b0..c5d46abe57ff5a918b926edf41650eefd25449be 100644 (file)
--- 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);