r7838: lie about the printer status when doing the queryvalue() registry call. Note...

(This used to be commit 0a22ea9eb7fd5aa8c57d2bf1ea2a171b377cab5a)

diff --git a/source3/registry/reg_printing.c b/source3/registry/reg_printing.c
index b0fb4ab9d900d4bd5b21cb6fa8e20fa30a07a1d4..1ac91f4b90c15d0fda6ad8c3f6dd61e31fa0cc2d 100644 (file)
--- a/source3/registry/reg_printing.c
+++ b/source3/registry/reg_printing.c
@@ -639,6 +639,7 @@ static int print_subpath_values_printers( char *key, REGVAL_CTR *val )
        
        if ( !new_path ) {
                char *p;
+               uint32 printer_status = PRINTER_STATUS_OK;
 
                /* we are dealing with the printer itself */
 
@@ -652,7 +653,10 @@ static int print_subpath_values_printers( char *key, REGVAL_CTR *val )
                regval_ctr_addvalue( val, "Priority",         REG_DWORD, (char*)&info2->priority,         sizeof(info2->attributes) );
                regval_ctr_addvalue( val, "ChangeID",         REG_DWORD, (char*)&info2->changeid,         sizeof(info2->changeid) );
                regval_ctr_addvalue( val, "Default Priority", REG_DWORD, (char*)&info2->default_priority, sizeof(info2->default_priority) );
-               regval_ctr_addvalue( val, "Status",           REG_DWORD, (char*)&info2->status,           sizeof(info2->status) );
+
+               /* lie and say everything is ok since we don't want to call print_queue_length() to get the real status */
+               regval_ctr_addvalue( val, "Status",           REG_DWORD, (char*)&printer_status,          sizeof(info2->status) );
+
                regval_ctr_addvalue( val, "StartTime",        REG_DWORD, (char*)&info2->starttime,        sizeof(info2->starttime) );
                regval_ctr_addvalue( val, "UntilTime",        REG_DWORD, (char*)&info2->untiltime,        sizeof(info2->untiltime) );