mirror of
https://github.com/samba-team/samba.git
synced 2025-03-09 08:58:35 +03:00
fixes for prnadmin.dll API
* force the PRINTER_ATTRIBUTE_LOCAL (nor PRINTER_ATTRIBUTE_NETWORK) * ensure that we return the sec_desc in smb_io_printer_info_2 (allows prnui.dll to restore security descriptors from a data file). (This used to be commit c335cb80d2e4c687279b7a6038a97518770ccae9)
This commit is contained in:
parent
9a8e30d04b
commit
cc98a35689
@ -375,7 +375,7 @@ PRINTER_MESSAGE_INFO;
|
||||
|
||||
#define PRINTER_ATTRIBUTE_SAMBA (PRINTER_ATTRIBUTE_RAW_ONLY|\
|
||||
PRINTER_ATTRIBUTE_SHARED|\
|
||||
PRINTER_ATTRIBUTE_NETWORK)
|
||||
PRINTER_ATTRIBUTE_LOCAL)
|
||||
|
||||
#define NO_PRIORITY 0
|
||||
#define MAX_PRIORITY 99
|
||||
|
@ -3292,7 +3292,7 @@ static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr, const char *sh
|
||||
info.parameters);
|
||||
|
||||
/* Samba has to have shared raw drivers. */
|
||||
info.attributes |= PRINTER_ATTRIBUTE_SAMBA;
|
||||
info.attributes = PRINTER_ATTRIBUTE_SAMBA;
|
||||
|
||||
/* Restore the stripped strings. */
|
||||
slprintf(info.servername, sizeof(info.servername)-1, "\\\\%s", get_called_name());
|
||||
|
@ -2561,7 +2561,7 @@ BOOL smb_io_printer_info_2(const char *desc, NEW_BUFFER *buffer, PRINTER_INFO_2
|
||||
return False;
|
||||
|
||||
/* parse the sec_desc */
|
||||
if (has_secdesc) {
|
||||
if (info->secdesc) {
|
||||
if (!prs_set_offset(ps, sd_offset))
|
||||
return False;
|
||||
if (!smb_io_relsecdesc("secdesc", buffer, depth, &info->secdesc))
|
||||
|
Loading…
x
Reference in New Issue
Block a user