Changeset 134 for branches/samba-3.0/source/printing

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

Location:

branches/samba-3.0/source/printing

Files:

• nt_printing.c (modified) (16 diffs)
• printing.c (modified) (2 diffs)

branches/samba-3.0/source/printing/nt_printing.c

@@ -72 +72 @@
         SERVER_EXECUTE,
         SERVER_ALL_ACCESS
+};
+
+/* Map generic permissions to job object specific permissions */
+
+GENERIC_MAPPING job_generic_mapping = {
+        JOB_READ,
+        JOB_WRITE,
+        JOB_EXECUTE,
+        JOB_ALL_ACCESS
 };
 
@@ -3744 +3753 @@
  Get a default printer info 2 struct.
 ****************************************************************************/
-static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 *info, const char *servername, const char* sharename)
+
+static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 *info,
+                                        const char *servername,
+                                        const char* sharename,
+                                        BOOL get_loc_com)
 {
         int snum = lp_servicenumber(sharename);
@@ -3771 +3784 @@
 
 #ifdef HAVE_CUPS
-        if ( (enum printing_types)lp_printing(snum) == PRINT_CUPS ) {           
+        if (get_loc_com && (enum printing_types)lp_printing(snum) == PRINT_CUPS ) {             
                 /* Pull the location and comment strings from cups if we don't
                    already have one */
@@ -3820 +3833 @@
 /****************************************************************************
 ****************************************************************************/
-static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 *info, const char *servername, const char *sharename)
+
+static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 *info,
+                                const char *servername,
+                                const char *sharename,
+                                BOOL get_loc_com)
 {
         int len = 0;
@@ -3832 +3849 @@
         dbuf = tdb_fetch(tdb_printers, kbuf);
         if (!dbuf.dptr) {
-                return get_a_printer_2_default(info, servername, sharename);
+                return get_a_printer_2_default(info, servername,
+                                sharename, get_loc_com);
         }
 
@@ -3875 +3893 @@
 
 #ifdef HAVE_CUPS
-        if ( (enum printing_types)lp_printing(snum) == PRINT_CUPS ) {           
+        if (get_loc_com && (enum printing_types)lp_printing(snum) == PRINT_CUPS ) {             
                 /* Pull the location and comment strings from cups if we don't
                    already have one */
@@ -4449 +4467 @@
 ****************************************************************************/
 
-WERROR get_a_printer( Printer_entry *print_hnd, NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, 
-                        const char *sharename)
+static WERROR get_a_printer_internal( Printer_entry *print_hnd, NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, 
+                        const char *sharename, BOOL get_loc_com)
 {
         WERROR result;
@@ -4478 +4496 @@
                         }
 
-                        result = get_a_printer_2( (*pp_printer)->info_2, servername, sharename );
+                        result = get_a_printer_2( (*pp_printer)->info_2,
+                                        servername,
+                                        sharename,
+                                        get_loc_com);
         
                         
@@ -4500 +4521 @@
         
         return WERR_OK;
+}
+
+WERROR get_a_printer( Printer_entry *print_hnd, NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, 
+                        const char *sharename)
+{
+        return get_a_printer_internal(print_hnd, pp_printer, level,
+                                        sharename, True);
+}
+
+WERROR get_a_printer_search( Printer_entry *print_hnd, NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, 
+                        const char *sharename)
+{
+        return get_a_printer_internal(print_hnd, pp_printer, level,
+                                        sharename, False);
 }
 
@@ -4720 +4755 @@
 {
         int i = 0;
-        
+
         if ( !info )
                 return False;
-                
+
+        /* mz: skip files that are in the list but already deleted */
+        if (!file || !file[0]) {
+                return false;
+        }
+
         if ( strequal(file, info->driverpath) )
                 return True;
@@ -4836 +4876 @@
   Upon return, *info has been modified to only contain the driver files
   which are not in use
+
+  Fix from mz:
+
+  This needs to check all drivers to ensure that all files in use
+  have been removed from *info, not just the ones in the first
+  match.
 ****************************************************************************/
 
@@ -4845 +4891 @@
         fstring                         *list = NULL;
         NT_PRINTER_DRIVER_INFO_LEVEL    driver;
-        
+        BOOL in_use = False;
+
         if ( !info )
                 return False;
@@ -4880 +4927 @@
                 if ( !strequal(info->name, driver.info_3->name) ) {
                         if ( trim_overlap_drv_files(info, driver.info_3) ) {
-                                free_a_printer_driver(driver, 3);
-                                SAFE_FREE( list );
-                                return True;
+                                /* mz: Do not instantly return -
+                                 * we need to ensure this file isn't
+                                 * also in use by other drivers. */
+                                in_use = True;
                         }
                 }
@@ -4898 +4946 @@
                 dump_a_printer_driver( driver, 3 );
         
-        return False;
+        return in_use;
 }
 
@@ -5425 +5473 @@
 }
 
+void map_job_permissions(SEC_DESC *sd)
+{
+        int i;
+
+        for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
+                se_map_generic(&sd->dacl->aces[i].access_mask,
+                               &job_generic_mapping);
+        }
+}
+
+
 /****************************************************************************
  Check a user has permissions to perform the given operation.  We use the
@@ -5506 +5565 @@
                 }
 
-                /* Now this is the bit that really confuses me.  The access
-                   type needs to be changed from JOB_ACCESS_ADMINISTER to
-                   PRINTER_ACCESS_ADMINISTER for this to work.  Something
-                   to do with the child (job) object becoming like a
-                   printer??  -tpot */
-
-                access_type = PRINTER_ACCESS_ADMINISTER;
-        }
-        
+                map_job_permissions(secdesc->sec);
+        } else {
+                map_printer_permissions(secdesc->sec);
+        }
+
         /* Check access */
-        
-        map_printer_permissions(secdesc->sec);
-
         result = se_access_check(secdesc->sec, user->nt_user_token, access_type,
                                  &access_granted, &status);

branches/samba-3.0/source/printing/printing.c

@@ -2526 +2526 @@
                 goto fail;
 
-        /* The print job has been sucessfully handed over to the back-end */
+        /* The print job has been successfully handed over to the back-end */
         
         pjob->spooled = True;
@@ -2540 +2540 @@
 fail:
 
-        /* The print job was not succesfully started. Cleanup */
+        /* The print job was not successfully started. Cleanup */
         /* Still need to add proper error return propagation! 010122:JRR */
         unlink(pjob->filename);