Changeset 590 for trunk/server/source3/printing

Timestamp:

Jul 1, 2011, 8:40:10 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.6

Location:

trunk/server/source3/printing

Files:

• load.c (modified) (1 diff)
• nt_printing.c (modified) (1 diff)

trunk/server/source3/printing/load.c

@@ -32 +32 @@
 
         if (pnum < 0)
+                if (process_registry_service(PRINTERS_NAME))
+                        pnum = lp_servicenumber(PRINTERS_NAME);
+
+        if (pnum < 0)
                 return;
 

trunk/server/source3/printing/nt_printing.c

@@ -5728 +5728 @@
         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);