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_cups.c | |
| parent | 4a2cc231d22a82ed21771a72508f15d21ed63227 (diff) | |
| download | samba-54abd2aa66069e6baf7769c496f46d9dba18db39.tar.gz samba-54abd2aa66069e6baf7769c496f46d9dba18db39.tar.bz2 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_cups.c')
| -rw-r--r-- | source3/printing/print_cups.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index e6064564dc..8ae896fddf 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -265,7 +265,7 @@ BOOL cups_cache_reload(void) * 'cups_job_delete()' - Delete a job. */ -static int cups_job_delete(int snum, struct printjob *pjob) +static int cups_job_delete(const char *sharename, const char *lprm_command, struct printjob *pjob) { int ret = 1; /* Return value */ http_t *http = NULL; /* HTTP connection to server */ @@ -275,7 +275,7 @@ static int cups_job_delete(int snum, struct printjob *pjob) char uri[HTTP_MAX_URI]; /* printer-uri attribute */ - DEBUG(5,("cups_job_delete(%d, %p (%d))\n", snum, pjob, pjob->sysjob)); + DEBUG(5,("cups_job_delete(%s, %p (%d))\n", sharename, pjob, pjob->sysjob)); /* * Make sure we don't ask for passwords... @@ -712,7 +712,7 @@ static int cups_queue_get(const char *sharename, *q = NULL; - /* HACK ALERT!!! The porblem with support the 'printer name' + /* HACK ALERT!!! The problem with support the 'printer name' option is that we key the tdb off the sharename. So we will overload the lpq_command string to pass in the printername (which is basically what we do for non-cups printers ... using |