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 f96b4fa96ab340ce5ab020131a9c17920d1dab8d..d9fc0c6a6ab9bd5af2e721c8ad0facea3a5de73e 100755 (executable)
--- 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 a0649d0a0b7fa13d6cf20684702df4f98ea75917..f7e2945426b2211699649cbc19d421a14e266cfb 100644 (file)
--- 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 758131676763ec22a11cb76acfc15fafba05d80a..ae087c7f7746844e1f11e27ed5fea6f2e4d2c609 100644 (file)
--- 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))