Changeset 745 for trunk/server/source3/printing/print_generic.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/printing/print_generic.c (modified) (5 diffs)

trunk/server/source3/printing/print_generic.c

@@ -118 +118 @@
         /* need to pause the spooled entry */
         slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
-        return print_run_command(snum, PRINTERNAME(snum), True,
+        return print_run_command(snum, lp_printername(snum), True,
                                  lp_lppausecommand(snum), NULL,
                                  "%j", jobstr,
@@ -133 +133 @@
         /* need to pause the spooled entry */
         slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
-        return print_run_command(snum, PRINTERNAME(snum), True,
+        return print_run_command(snum, lp_printername(snum), True,
                                  lp_lpresumecommand(snum), NULL,
                                  "%j", jobstr,
@@ -195 +195 @@
 
         /* send it to the system spooler */
-        ret = print_run_command(snum, PRINTERNAME(snum), True,
+        ret = print_run_command(snum, lp_printername(snum), True,
                         lp_printcommand(snum), NULL,
                         "%s", p,
@@ -275 +275 @@
 static int generic_queue_pause(int snum)
 {
-        return print_run_command(snum, PRINTERNAME(snum), True, lp_queuepausecommand(snum), NULL, NULL);
+        return print_run_command(snum, lp_printername(snum), True,
+                                 lp_queuepausecommand(snum), NULL, NULL);
 }
 
@@ -283 +284 @@
 static int generic_queue_resume(int snum)
 {
-        return print_run_command(snum, PRINTERNAME(snum), True, lp_queueresumecommand(snum), NULL, NULL);
+        return print_run_command(snum, lp_printername(snum), True,
+                                 lp_queueresumecommand(snum), NULL, NULL);
 }