diff options
author | Gerald Carter <jerry@samba.org> | 2002-08-08 20:54:37 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2002-08-08 20:54:37 +0000 |
commit | 14d385439d99f0eadca5296aeef800c67038916b (patch) | |
tree | 67273c5955127e563bf845bc0ed47788f6fd59b4 /source3/include | |
parent | 4267fcccdab729a54de68d15f6d2fc36584e7e92 (diff) | |
download | samba-14d385439d99f0eadca5296aeef800c67038916b.tar.gz samba-14d385439d99f0eadca5296aeef800c67038916b.tar.bz2 samba-14d385439d99f0eadca5296aeef800c67038916b.zip |
printing change notification merge from APPLIANCE_HEAD
(This used to be commit 11ddfd9cfa550dcd3186c8aaf0cc038ce7f1791f)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/messages.h | 1 | ||||
-rwxr-xr-x | source3/include/rpc_spoolss.h | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source3/include/messages.h b/source3/include/messages.h index 79a08a7546..58e606b40f 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -51,6 +51,7 @@ /* #define MSG_PRINTER_NOTIFY 2001*/ /* Obsolete */ #define MSG_PRINTER_DRVUPGRADE 2002 #define MSG_PRINTER_NOTIFY2 2003 +#define MSG_PRINTERDATA_INIT_RESET 2004 /* smbd messages */ #define MSG_SMB_CONF_UPDATED 3001 diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h index 7ec9a509bf..b7acf44c5d 100755 --- a/source3/include/rpc_spoolss.h +++ b/source3/include/rpc_spoolss.h @@ -202,6 +202,7 @@ #define NOTIFY_TWO_VALUE 2 /* Notify data is stored in value2 */ #define NOTIFY_POINTER 3 /* Data is a pointer to a buffer */ #define NOTIFY_STRING 4 /* Data is a pointer to a buffer w/length */ +#define NOTIFY_SECDESC 5 /* Data is a security descriptor */ #define PRINTER_NOTIFY_TYPE 0x00 #define JOB_NOTIFY_TYPE 0x01 @@ -801,15 +802,16 @@ typedef struct spool_notify_info_data uint16 field; uint32 reserved; uint32 id; - union - { + union { uint32 value[2]; - struct - { + struct { uint32 length; uint16 *string; - } - data; + } data; + struct { + uint32 size; + SEC_DESC *desc; + } sd; } notify_data; uint32 size; |