lib: Give lib/util/util_file.c its own header file

[samba.git] / source3 / printing / print_generic.c

diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index efe910d7b44b80b1b4aa6c107210b04cddc3baca..a8bf9aff972527fb6337c6c139ffde5df68b4efe 100644 (file)
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -18,9 +18,11 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "printing.h"
+#include "smbd/proto.h"
+#include "source3/lib/substitute.h"
 
-extern struct current_user current_user;
 extern userdom_struct current_user_info;
 
 /****************************************************************************
@@ -31,6 +33,8 @@ extern userdom_struct current_user_info;
 static int print_run_command(int snum, const char* printername, bool do_sub,
                             const char *command, int *outfd, ...)
 {
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
        char *syscmd;
        char *arg;
        int ret;
@@ -56,6 +60,8 @@ static int print_run_command(int snum, const char* printername, bool do_sub,
                return -1;
        }
 
+       DBG_DEBUG("Incoming command '%s'\n", syscmd);
+
        while ((arg = va_arg(ap, char *))) {
                char *value = va_arg(ap,char *);
                syscmd = talloc_string_sub(ctx, syscmd, arg, value);
@@ -71,21 +77,24 @@ static int print_run_command(int snum, const char* printername, bool do_sub,
                return -1;
        }
 
+       syscmd = lpcfg_substituted_string(ctx, lp_sub, syscmd);
+       if (syscmd == NULL) {
+               return -1;
+       }
+
        if (do_sub && snum != -1) {
                syscmd = talloc_sub_advanced(ctx,
-                               lp_servicename(talloc_tos(), snum),
+                               lp_servicename(talloc_tos(), lp_sub, snum),
                                current_user_info.unix_name,
                                "",
-                               current_user.ut.gid,
-                               get_current_username(),
-                               current_user_info.domain,
+                               get_current_gid(NULL),
                                syscmd);
                if (!syscmd) {
                        return -1;
                }
        }
 
-       ret = smbrun_no_sanitize(syscmd,outfd);
+       ret = smbrun_no_sanitize(syscmd, outfd, NULL);
 
        DEBUG(3,("Running the command `%s' gave %d\n",syscmd,ret));
 
@@ -101,7 +110,7 @@ static int generic_job_delete( const char *sharename, const char *lprm_command,
        fstring jobstr;
 
        /* need to delete the spooled entry */
-       slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
+       fstr_sprintf(jobstr, "%d", pjob->sysjob);
        return print_run_command( -1, sharename, False, lprm_command, NULL,
                   "%j", jobstr,
                   "%T", http_timestring(talloc_tos(), pjob->starttime),
@@ -113,12 +122,14 @@ pause a job
 ****************************************************************************/
 static int generic_job_pause(int snum, struct printjob *pjob)
 {
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
        fstring jobstr;
        
        /* need to pause the spooled entry */
-       slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
-       return print_run_command(snum, lp_printername(talloc_tos(), snum), True,
-                                lp_lppausecommand(talloc_tos(), snum), NULL,
+       fstr_sprintf(jobstr, "%d", pjob->sysjob);
+       return print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True,
+                                lp_lppause_command(snum), NULL,
                                 "%j", jobstr,
                                 NULL);
 }
@@ -128,12 +139,14 @@ resume a job
 ****************************************************************************/
 static int generic_job_resume(int snum, struct printjob *pjob)
 {
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
        fstring jobstr;
 
        /* need to pause the spooled entry */
-       slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
-       return print_run_command(snum, lp_printername(talloc_tos(), snum), True,
-                                lp_lpresumecommand(talloc_tos(), snum), NULL,
+       fstr_sprintf(jobstr, "%d", pjob->sysjob);
+       return print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True,
+                                lp_lpresume_command(snum), NULL,
                                 "%j", jobstr,
                                 NULL);
 }
@@ -153,7 +166,7 @@ static int generic_queue_get(const char *printer_name,
        print_queue_struct *queue = NULL;
 
        /* never do substitution when running the 'lpq command' since we can't
-          get it rigt when using the background update daemon.  Make the caller
+          get it right when using the background update daemon.  Make the caller
           do it before passing off the command string to us here. */
 
        print_run_command(-1, printer_name, False, lpq_command, &fd, NULL);
@@ -203,6 +216,8 @@ static int generic_job_submit(int snum, struct printjob *pjob,
                              char *lpq_cmd)
 {
        int ret = -1;
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
        char *current_directory = NULL;
        char *print_directory = NULL;
        char *wd = NULL;
@@ -250,12 +265,12 @@ static int generic_job_submit(int snum, struct printjob *pjob,
                ret = -1;
                goto out;
        }
-       slprintf(job_page_count, sizeof(job_page_count)-1, "%d", pjob->page_count);
-       slprintf(job_size, sizeof(job_size)-1, "%lu", (unsigned long)pjob->size);
+       fstr_sprintf(job_page_count, "%d", pjob->page_count);
+       fstr_sprintf(job_size, "%zu", pjob->size);
 
        /* send it to the system spooler */
-       ret = print_run_command(snum, lp_printername(talloc_tos(), snum), True,
-                       lp_printcommand(talloc_tos(), snum), NULL,
+       ret = print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True,
+                       lp_print_command(snum), NULL,
                        "%s", p,
                        "%J", jobname,
                        "%f", p,
@@ -272,7 +287,7 @@ static int generic_job_submit(int snum, struct printjob *pjob,
         * determine the backend job identifier (sysjob).
         */
        pjob->sysjob = -1;
-       ret = generic_queue_get(lp_printername(talloc_tos(), snum),
+       ret = generic_queue_get(lp_printername(talloc_tos(), lp_sub, snum),
                                printing_type, lpq_cmd, &q, &status);
        if (ret > 0) {
                int i;
@@ -288,7 +303,7 @@ static int generic_job_submit(int snum, struct printjob *pjob,
                ret = 0;
        }
        if (pjob->sysjob == -1) {
-               DEBUG(0, ("failed to get sysjob for job %u (%s), tracking as "
+               DEBUG(2, ("failed to get sysjob for job %u (%s), tracking as "
                          "Unix job\n", pjob->jobid, jobname));
        }
 
@@ -307,8 +322,11 @@ static int generic_job_submit(int snum, struct printjob *pjob,
 ****************************************************************************/
 static int generic_queue_pause(int snum)
 {
-       return print_run_command(snum, lp_printername(talloc_tos(), snum), True,
-                                lp_queuepausecommand(talloc_tos(), snum), NULL, NULL);
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
+
+       return print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True,
+                                lp_queuepause_command(snum), NULL, NULL);
 }
 
 /****************************************************************************
@@ -316,8 +334,11 @@ static int generic_queue_pause(int snum)
 ****************************************************************************/
 static int generic_queue_resume(int snum)
 {
-       return print_run_command(snum, lp_printername(talloc_tos(), snum), True,
-                                lp_queueresumecommand(talloc_tos(), snum), NULL, NULL);
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
+
+       return print_run_command(snum, lp_printername(talloc_tos(), lp_sub, snum), True,
+                                lp_queueresume_command(snum), NULL, NULL);
 }
 
 /****************************************************************************