diff options
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/notify.c | 35 | ||||
| -rw-r--r-- | source3/printing/nt_printing.c | 4 |
2 files changed, 35 insertions, 4 deletions
diff --git a/source3/printing/notify.c b/source3/printing/notify.c index c344edb8d8..50c5ce39f6 100644 --- a/source3/printing/notify.c +++ b/source3/printing/notify.c @@ -190,11 +190,35 @@ void print_notify_send_messages(unsigned int timeout) talloc_destroy_pool(send_ctx); } +/********************************************************************** + deep copy a SPOOLSS_NOTIFY_MSG structure using a TALLOC_CTX + *********************************************************************/ + +static BOOL copy_notify2_msg( SPOOLSS_NOTIFY_MSG *to, SPOOLSS_NOTIFY_MSG *from ) +{ + + if ( !to || !from ) + return False; + + memcpy( to, from, sizeof(SPOOLSS_NOTIFY_MSG) ); + + if ( from->len ) { + to->notify.data = talloc_memdup(send_ctx, from->notify.data, from->len ); + if ( !to->notify.data ) { + DEBUG(0,("copy_notify2_msg: talloc_memdup() of size [%d] failed!\n", from->len )); + return False; + } + } + + + return True; +} + /******************************************************************* Batch up print notify messages. *******************************************************************/ -static void send_spoolss_notify2_msg(struct spoolss_notify_msg *msg) +static void send_spoolss_notify2_msg(SPOOLSS_NOTIFY_MSG *msg) { struct notify_queue *pnqueue, *tmp_ptr; @@ -227,7 +251,14 @@ in notify_queue\n", msg->type, msg->field, msg->printer)); return; } - pnqueue->msg = msg; + /* allocate a new msg structure and copy the fields */ + + if ( !(pnqueue->msg = (SPOOLSS_NOTIFY_MSG*)talloc(send_ctx, sizeof(SPOOLSS_NOTIFY_MSG))) ) { + DEBUG(0,("send_spoolss_notify2_msg: talloc() of size [%d] failed!\n", + sizeof(SPOOLSS_NOTIFY_MSG))); + return; + } + copy_notify2_msg(pnqueue->msg, msg); pnqueue->buf = NULL; pnqueue->buflen = 0; diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 73f1dd5f0d..10d490a4c1 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -3132,7 +3132,7 @@ static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 **info_ptr, fstrin fstrcpy(info.printprocessor, "winprint"); fstrcpy(info.datatype, "RAW"); - info.attributes = PRINTER_ATTRIBUTE_SHARED | PRINTER_ATTRIBUTE_NETWORK; /* attributes */ + info.attributes = PRINTER_ATTRIBUTE_SAMBA; info.starttime = 0; /* Minutes since 12:00am GMT */ info.untiltime = 0; /* Minutes since 12:00am GMT */ @@ -3224,7 +3224,7 @@ static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr, fstring sharen info.parameters); /* Samba has to have shared raw drivers. */ - info.attributes |= (PRINTER_ATTRIBUTE_SHARED | PRINTER_ATTRIBUTE_NETWORK); + info.attributes |= PRINTER_ATTRIBUTE_SAMBA; /* Restore the stripped strings. */ slprintf(info.servername, sizeof(info.servername)-1, "\\\\%s", get_called_name()); |