diff options
| author | Gerald Carter <jerry@samba.org> | 2005-09-30 17:13:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:04:48 -0500 |
| commit | 54abd2aa66069e6baf7769c496f46d9dba18db39 (patch) | |
| tree | 9cf8e88168011797319ba9e9866749201b1eac1e /source3/printing/print_generic.c | |
| parent | 4a2cc231d22a82ed21771a72508f15d21ed63227 (diff) | |
| download | samba-54abd2aa66069e6baf7769c496f46d9dba18db39.tar.gz samba-54abd2aa66069e6baf7769c496f46d9dba18db39.tar.xz samba-54abd2aa66069e6baf7769c496f46d9dba18db39.zip | |
r10656: BIG merge from trunk. Features not copied over
* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
(This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3)
Diffstat (limited to 'source3/printing/print_generic.c')
| -rw-r--r-- | source3/printing/print_generic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c index 256654179e..b2484d5b43 100644 --- a/source3/printing/print_generic.c +++ b/source3/printing/print_generic.c @@ -27,7 +27,8 @@ run a given print command a null terminated list of value/substitute pairs is provided for local substitution strings ****************************************************************************/ -static int print_run_command(int snum, const char* printername, BOOL do_sub, char *command, int *outfd, ...) +static int print_run_command(int snum, const char* printername, BOOL do_sub, + const char *command, int *outfd, ...) { pstring syscmd; @@ -68,14 +69,13 @@ static int print_run_command(int snum, const char* printername, BOOL do_sub, cha /**************************************************************************** delete a print job ****************************************************************************/ -static int generic_job_delete(int snum, struct printjob *pjob) +static int generic_job_delete( const char *sharename, const char *lprm_command, struct printjob *pjob) { fstring jobstr; /* need to delete the spooled entry */ slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob); - return print_run_command(snum, PRINTERNAME(snum), True, - lp_lprmcommand(snum), NULL, + return print_run_command( -1, sharename, False, lprm_command, NULL, "%j", jobstr, "%T", http_timestring(pjob->starttime), NULL); |