From: Gerald Carter <jerry@samba.org>
Date: Wed, 24 Mar 2004 19:15:17 +0000 (+0000)
Subject: fixes for prnadmin.dll API
X-Git-Tag: samba-4.0.0alpha6~801^2~11777
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc98a35689b114aed9bab705e54881e5439805e3;p=thirdparty%2Fsamba.git

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)
---

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index f96b4fa96ab..d9fc0c6a6ab 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 a0649d0a0b7..f7e2945426b 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 75813167676..ae087c7f774 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))