summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-01-07 06:13:40 +0000
committerTim Potter <tpot@samba.org>2002-01-07 06:13:40 +0000
commit17729f5dc5aa4a19fd2cdfed12f86da3e9d07ecc (patch)
tree64403dbb0af9656d89bf8eed14bfe7bbcfed44db
parent9a02c6b4e8dcdd8bb6f2d394b1c5e9110c11a7a9 (diff)
downloadsamba-17729f5dc5aa4a19fd2cdfed12f86da3e9d07ecc.tar.gz
samba-17729f5dc5aa4a19fd2cdfed12f86da3e9d07ecc.tar.bz2
samba-17729f5dc5aa4a19fd2cdfed12f86da3e9d07ecc.zip
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)
-rw-r--r--source3/include/nt_printing.h2
-rwxr-xr-xsource3/include/rpc_spoolss.h2
-rw-r--r--source3/printing/nt_printing.c2
-rw-r--r--source3/rpc_parse/parse_spoolss.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 61abc1a31b..4c9265f09f 100644
--- 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 bd9de92dcb..e6e5e0ada2 100755
--- 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 7c56512173..a0dacc14c5 100644
--- 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 14e22c4195..66252c1a19 100644
--- 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;