Sed error. The status value in the PRINTER_INFO_2 structure isn't a WERROR

but a plain old uint32.
(This used to be commit 690cc12bad2a037684a43b0dcb48be8eb03aa7bc)

diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 61abc1a31bc1ac7db3e64e0d3c666228c2213626..4c9265f09fa1429aa2cba5fd9277a434a23898b1 100644 (file)
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -231,7 +231,7 @@ typedef struct nt_printer_info_level_2
        uint32 default_priority;
        uint32 starttime;
        uint32 untiltime;
-       WERROR status;
+       uint32 status;
        uint32 cjobs;
        uint32 averageppm;
        fstring servername;

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index bd9de92dcb7e156734307756e7a71a2dc53daed6..e6e5e0ada25177bf4ce505d81a5deb418f74d1e9 100755 (executable)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -1314,7 +1314,7 @@ typedef struct spool_printer_info_level_2
        uint32 default_priority;
        uint32 starttime;
        uint32 untiltime;
-       WERROR status;
+       uint32 status;
        uint32 cjobs;
        uint32 averageppm;
        UNISTR2 servername;

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 7c56512173046ce62fa2c25e67113b47163a0121..a0dacc14c5785e7806e141b5a4ddf43f86284f13 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2576,7 +2576,7 @@ static uint32 dump_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
                                DEBUGADD(106,("default_priority:[%d]\n", info2->default_priority));
                                DEBUGADD(106,("starttime:[%d]\n", info2->starttime));
                                DEBUGADD(106,("untiltime:[%d]\n", info2->untiltime));
-                               DEBUGADD(106,("status:[%s]\n", werror_str(info2->status)));
+                               DEBUGADD(106,("status:[%d]\n", info2->status));
                                DEBUGADD(106,("cjobs:[%d]\n", info2->cjobs));
                                DEBUGADD(106,("averageppm:[%d]\n", info2->averageppm));
                                DEBUGADD(106,("changeid:[%d]\n", info2->changeid));

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 14e22c4195bdcb5e17390b4f3aeb26ab97ee0658..66252c1a194a80f7ad11f6a1935700fb6d39cfcc 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -4332,7 +4332,7 @@ BOOL spool_io_printer_info_level_2(char *desc, SPOOL_PRINTER_INFO_LEVEL_2 *il, p
                return False;
        if(!prs_uint32("untiltime", ps, depth, &il->untiltime))
                return False;
-       if(!prs_werror("status", ps, depth, &il->status))
+       if(!prs_uint32("status", ps, depth, &il->status))
                return False;
        if(!prs_uint32("cjobs", ps, depth, &il->cjobs))
                return False;