[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  0d6d068... s3-printing: Fix "printer admin" functionality.
      from  55c4511... charset: fixed a problem with the global use of the iconv_convenience structure

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0d6d068bc4f76c2816f969fcce6013e1945794d4
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 18 11:21:15 2010 +0100

    s3-printing: Fix "printer admin" functionality.
    
    Fix bug #7255 ("printer admin" parameter does not work as expected).

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

Summary of changes:
 source3/printing/nt_printing.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index c080037..b29000a 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -5720,7 +5720,7 @@ bool print_access_check(struct auth_serversupplied_info *server_info, int snum,
 
         /* see if we need to try the printer admin list */
 
-        if ((access_granted == 0) &&
+        if (!NT_STATUS_IS_OK(status) &&
 	    (token_contains_name_in_list(uidtoname(server_info->utok.uid),
 					 NULL, NULL, server_info->ptok,
 					 lp_printer_admin(snum)))) {


-- 
Samba Shared Repository