s3: rename talloc_sub_advanced() to talloc_sub_full()

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

diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index 72bfa2b9783b17efcc71bbf52579dd0cceabc87c..9c47d3ff7a51f4f587b6edfc9ef85c53a8af42b4 100644 (file)
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -19,8 +19,8 @@
 
 #include "includes.h"
 #include "printing.h"
+#include "smbd/proto.h"
 
-extern struct current_user current_user;
 extern userdom_struct current_user_info;
 
 /****************************************************************************
@@ -72,11 +72,11 @@ static int print_run_command(int snum, const char* printername, bool do_sub,
        }
 
        if (do_sub && snum != -1) {
-               syscmd = talloc_sub_advanced(ctx,
+               syscmd = talloc_sub_full(ctx,
                                lp_servicename(talloc_tos(), snum),
                                current_user_info.unix_name,
                                "",
-                               current_user.ut.gid,
+                               get_current_gid(NULL),
                                get_current_username(),
                                current_user_info.domain,
                                syscmd);
@@ -85,7 +85,7 @@ static int print_run_command(int snum, const char* printername, bool do_sub,
                }
        }
 
-       ret = smbrun_no_sanitize(syscmd,outfd);
+       ret = smbrun_no_sanitize(syscmd, outfd, NULL);
 
        DEBUG(3,("Running the command `%s' gave %d\n",syscmd,ret));
 
@@ -308,7 +308,7 @@ 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);
+                                lp_queuepause_command(talloc_tos(), snum), NULL, NULL);
 }
 
 /****************************************************************************
@@ -317,7 +317,7 @@ 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);
+                                lp_queueresume_command(talloc_tos(), snum), NULL, NULL);
 }
 
 /****************************************************************************