[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  f3c852e... s3-printing: Fix Bug #7541, %D in "printer admin" 
causing smbd crash.
      from  3c4353d... s3-librpc: Fixed GUID_from_data_blob() with length of 32.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit f3c852eb5f771fc8a48aa674d39e1a4547e2eb3e
Author: Günther Deschner <g...@samba.org>
Date:   Thu Jul 1 13:58:56 2010 +0200

    s3-printing: Fix Bug #7541, %D in "printer admin" causing smbd crash.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/printing/nt_printing.c      |    4 +++-
 source3/rpc_server/srv_spoolss_nt.c |   22 +++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 200a51a..f97b746 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -5727,7 +5727,9 @@ bool print_access_check(struct auth_serversupplied_info 
*server_info, int snum,
 
         if (!NT_STATUS_IS_OK(status) &&
            (token_contains_name_in_list(uidtoname(server_info->utok.uid),
-                                        NULL, NULL, server_info->ptok,
+                                        
pdb_get_domain(server_info->sam_account),
+                                        NULL,
+                                        server_info->ptok,
                                         lp_printer_admin(snum)))) {
                talloc_destroy(mem_ctx);
                return True;
diff --git a/source3/rpc_server/srv_spoolss_nt.c 
b/source3/rpc_server/srv_spoolss_nt.c
index 66538bc..4b5385b 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1645,7 +1645,8 @@ WERROR _spoolss_OpenPrinterEx(pipes_struct *p,
                                                 &se_printop ) &&
                            !token_contains_name_in_list(
                                    uidtoname(p->server_info->utok.uid),
-                                   NULL, NULL,
+                                   pdb_get_domain(p->server_info->sam_account),
+                                   NULL,
                                    p->server_info->ptok,
                                    lp_printer_admin(snum))) {
                                close_printer_handle(p, r->out.handle);
@@ -1941,8 +1942,10 @@ WERROR _spoolss_DeletePrinterDriver(pipes_struct *p,
        if ( (p->server_info->utok.uid != sec_initial_uid())
                && !user_has_privileges(p->server_info->ptok, &se_printop )
                && !token_contains_name_in_list(
-                       uidtoname(p->server_info->utok.uid), NULL,
-                       NULL, p->server_info->ptok,
+                       uidtoname(p->server_info->utok.uid),
+                       pdb_get_domain(p->server_info->sam_account),
+                       NULL,
+                       p->server_info->ptok,
                        lp_printer_admin(-1)) )
        {
                return WERR_ACCESS_DENIED;
@@ -2040,7 +2043,9 @@ WERROR _spoolss_DeletePrinterDriverEx(pipes_struct *p,
        if ( (p->server_info->utok.uid != sec_initial_uid())
                && !user_has_privileges(p->server_info->ptok, &se_printop )
                && !token_contains_name_in_list(
-                       uidtoname(p->server_info->utok.uid), NULL, NULL,
+                       uidtoname(p->server_info->utok.uid),
+                       pdb_get_domain(p->server_info->sam_account),
+                       NULL,
                        p->server_info->ptok, lp_printer_admin(-1)) )
        {
                return WERR_ACCESS_DENIED;
@@ -7845,7 +7850,8 @@ WERROR _spoolss_AddForm(pipes_struct *p,
        if ((p->server_info->utok.uid != sec_initial_uid()) &&
             !user_has_privileges(p->server_info->ptok, &se_printop) &&
             !token_contains_name_in_list(uidtoname(p->server_info->utok.uid),
-                                         NULL, NULL,
+                                         
pdb_get_domain(p->server_info->sam_account),
+                                         NULL,
                                          p->server_info->ptok,
                                          lp_printer_admin(snum))) {
                DEBUG(2,("_spoolss_Addform: denied by insufficient 
permissions.\n"));
@@ -7926,7 +7932,8 @@ WERROR _spoolss_DeleteForm(pipes_struct *p,
        if ((p->server_info->utok.uid != sec_initial_uid()) &&
             !user_has_privileges(p->server_info->ptok, &se_printop) &&
             !token_contains_name_in_list(uidtoname(p->server_info->utok.uid),
-                                         NULL, NULL,
+                                         
pdb_get_domain(p->server_info->sam_account),
+                                         NULL,
                                          p->server_info->ptok,
                                          lp_printer_admin(snum))) {
                DEBUG(2,("_spoolss_DeleteForm: denied by insufficient 
permissions.\n"));
@@ -8009,7 +8016,8 @@ WERROR _spoolss_SetForm(pipes_struct *p,
        if ((p->server_info->utok.uid != sec_initial_uid()) &&
             !user_has_privileges(p->server_info->ptok, &se_printop) &&
             !token_contains_name_in_list(uidtoname(p->server_info->utok.uid),
-                                         NULL, NULL,
+                                         
pdb_get_domain(p->server_info->sam_account),
+                                         NULL,
                                          p->server_info->ptok,
                                          lp_printer_admin(snum))) {
                DEBUG(2,("_spoolss_Setform: denied by insufficient 
permissions.\n"));


-- 
Samba Shared Repository