DCERPC: Fix DRIVER_INFO_7 defines in DCE/RPC spoolss dissector

Guenther

Change-Id: I54fc0668ea1146860beabed6628334ed4f369bf0
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-on: https://code.wireshark.org/review/35487
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index cb2304d631c84f9c4a1addf88fd0fa2eb0c16dc9..9ba54e3b0cfb9fe75a2a818c3134a357596f9830 100644 (file)
--- a/epan/dissectors/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
@@ -2319,12 +2319,8 @@ static const value_string getprinter_action_vals[] = {
        { DS_PUBLISH, "Publish" },
        { DS_UNPUBLISH, "Unpublish" },
        { DS_UPDATE, "Update" },
-
-       /* Not sure what the constant values are here */
-
-/*     { DS_PENDING, "Pending" }, */
-/*     { DS_REPUBLISH, "Republish" }, */
-
+       { DS_PENDING, "Pending" },
+       { DS_REPUBLISH, "Republish" },
        { 0, NULL }
 };
 

diff --git a/epan/dissectors/packet-dcerpc-spoolss.h b/epan/dissectors/packet-dcerpc-spoolss.h
index 7a5d88411fd796755a3c4b1766364f6412eb078c..602b563ea5c62a056bccc300d8f75da12c39a192 100644 (file)
--- a/epan/dissectors/packet-dcerpc-spoolss.h
+++ b/epan/dissectors/packet-dcerpc-spoolss.h
@@ -547,9 +547,11 @@
 
 /* Printer info level 7 */
 
-#define DS_PUBLISH   1
-#define DS_UPDATE    2
-#define DS_UNPUBLISH 3
+#define DS_PUBLISH     0x00000001
+#define DS_UPDATE      0x00000002
+#define DS_UNPUBLISH   0x00000004
+#define DS_REPUBLISH   0x00000008
+#define DS_PENDING     0x80000000
 
 /* SetJob command values */