summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-03-24 19:15:17 +0000
committerGerald Carter <jerry@samba.org>2004-03-24 19:15:17 +0000
commitcc98a35689b114aed9bab705e54881e5439805e3 (patch)
treeb85fd48c3080c63a1558ee826b0ba7b624910783 /source3
parent9a8e30d04b1cfc53e8c8949a56d4f1cf5aa26501 (diff)
downloadsamba-cc98a35689b114aed9bab705e54881e5439805e3.tar.gz
samba-cc98a35689b114aed9bab705e54881e5439805e3.tar.bz2
samba-cc98a35689b114aed9bab705e54881e5439805e3.zip
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)
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/include/rpc_spoolss.h2
-rw-r--r--source3/printing/nt_printing.c2
-rw-r--r--source3/rpc_parse/parse_spoolss.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index f96b4fa96a..d9fc0c6a6a 100755
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -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
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index a0649d0a0b..f7e2945426 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -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());
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 7581316767..ae087c7f77 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -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))