summaryrefslogtreecommitdiff
path: root/source3/printing/print_cups.c
AgeCommit message (Collapse)AuthorFilesLines
2007-10-10r20245: merge 20244 from samba_3_0_24Herb Lewis1-2/+1
get rid of more nested extern declarations warnings (This used to be commit e9df051f5201843e3428ddbed7a719553c2e799a)
2007-10-10r20131: get rid of a few no previous prototype warningsHerb Lewis1-0/+1
(This used to be commit e710a7d39a662a1a339f3f71c4b051fde1bb5a16)
2007-10-10r17816: Merge my cupsprot branch. It is now possible to (optionally) specify ↵Jelmer Vernooij1-31/+37
:port in the "cups server" smb.conf parameter. (This used to be commit 3f665f4ec4cda80cc20e050458e150c086dc1412)
2007-10-10r13915: Fixed a very interesting class of realloc() bugs found by Coverity.Jeremy Allison1-5/+2
realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2007-10-10r10656: BIG merge from trunk. Features not copied overGerald Carter1-3/+3
* \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)
2007-10-10r5359: BUG 2333: use the lpq command to pass in the correct printer name for ↵Gerald Carter1-5/+14
cups_queue_get(). See comments in code for details (This used to be commit 3eee00e0d0e9b58cdd35209691072b625813681c)
2007-10-10r5012: fix segfault caused by using a ipp_t * after calling cupsDoRequest()Gerald Carter1-0/+2
(This used to be commit 0ac3c4c5a231c314213dbce29e25911ddb04de2d)
2007-10-10r4907: remove unreached codeGerald Carter1-1/+0
(This used to be commit 15fd4a05ec2439f41591ee8a1c30021d9a34371b)
2007-10-10r4902: please note that cupsDoRequest() deletes the request* so don't call ↵Gerald Carter1-32/+2
ippDelete(request) *ever* (This used to be commit f65598b3b0dc99900d547eb67473cca5d371614f)
2007-10-10r4881: Varient of Lar's patch for #2270. Jerry promises to test :-).Jeremy Allison1-258/+274
Jeremy. (This used to be commit 2afe2a16c92bb2500854b8e288c1d7704ede704a)
2007-10-10r4539: patch from Rob -- adding real printcap name cache function to speed ↵Gerald Carter1-107/+16
up printcap reloads (This used to be commit 1cad5250932b963c2eb9b775221b13db386d601b)
2007-10-10r4088: Get medieval on our ass about malloc.... :-). Take control of all our ↵Jeremy Allison1-1/+1
allocation functions so we can funnel through some well known functions. Should help greatly with malloc checking. HEAD patch to follow. Jeremy. (This used to be commit 620f2e608f70ba92f032720c031283d295c5c06a)
2007-10-10r4030: patch from Rob -- don't force the cups printer-make-and-model tag as ↵Gerald Carter1-24/+2
the comment for autoloaded printers (This used to be commit 26bbad62b9cfef4f2bb5cd3f2b2b7d13017e6439)
2007-10-10r3067: patch based on volker's initial work in trunk that fixes the queu ↵Gerald Carter1-31/+24
update problem when using the background daemon (This used to be commit de7af09e727e744aa27af85ef7c0f73ed5c1550a)
2007-10-10r979: Implement the 'cups server' option. This makes it possible to have virtualVolker Lendecke1-18/+29
smbd's connect to different cups daemons. Volker (This used to be commit 148dc71ea5c1ec619ba6f4873fa7c69a608e58cc)
2007-10-10r242: adding 'cups options' parameter to allow raw printing without changing ↵Gerald Carter1-1/+13
/etc/cups/cupsd.conf -- documentation to follow (This used to be commit 2f323b0991c37022fb59ef8c69454eff03296662)
2003-11-25allow users to delete jobs with cups printing backendGerald Carter1-1/+5
The changes the name of the job passed off to cups from "Test Page" to "smbprn.00000033 Test Page" so that we can get the smb jobid back from lpq. Working on bug 770. (This used to be commit 5979f4d645e84fb22223e6cbf0043f2fa21acb2f)
2003-11-24patch from Matthias Hilbig for bug 467; use the dns name (or IP) as the ↵Gerald Carter1-2/+7
originating client name when using CUPS (This used to be commit 71333299a6e6bc6d74d2172f71e3fe21ef75aa3c)
2003-11-12a small include file rearrangement that doesn't affect normalAndrew Tridgell1-0/+1
compilation, but that allows Samba3 to take advantage of pre-compiled headers in gcc if available. (This used to be commit b3e024ce1da7c7e24fcacd8a2964dd2e4562ba39)
2003-02-10Cleanups: (merge from HEAD)Andrew Bartlett1-3/+3
- use safe_strcpy() instead of pstrcpy() for malloc()ed strings - CUPS: a failure in an attempt to automaticly add a printer is not level 0 stuff. - Fix up a possible Realloc() failure segfault Andrew Bartlett (This used to be commit c1cfc296c2efdb2b5972202146e80f0e3b6a3da4)
2003-02-05CUPS patch to log client nameGerald Carter1-0/+4
(This used to be commit d4168c327bc42efc392561aeeef4edd702b3d653)
2003-01-28CUPS-PRINTER_CLASS patch from Michael SweetGerald Carter1-2/+101
(This used to be commit 8d0bde43156f5511df7a5a6865b361ebc2a933eb)
2003-01-15*lots of small merges form HEADGerald Carter1-6/+4
*sync up configure.in *don't build torture tools in make all *make sure to remove torture tools as part of make clean (This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef)
2002-11-29Merge a bunch of trivial changes from HEAD. The difference remainingTim Potter1-1/+0
should actual functional differences between HEAD and 3.0. - Mostly reformatting - Removal of unecessary #include "smb.h" - Merge of dyn_DRIVERFILE removal - Silly bug fix for python code (This used to be commit d3998307adc50ba50defe610cb656c73799ae3b9)
2002-09-25sync'ing up for 3.0alpha20 releaseGerald Carter1-2/+6
(This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-07-15updated the 3.0 branch from the head branch - ready for alpha18Andrew Tridgell1-1/+1
(This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-03-17Fix ability to compile with CUPS support.John Terpstra1-2/+2
(This used to be commit 208c62c5a7bca68f223b5832d7971c3d38cb6820)
2001-11-17Tidyups when I was doing the big merge...Jeremy Allison1-1/+1
Jeremy. (This used to be commit 9148bb9eaa67de60c3b0b4709a9c05a840c20c66)
2001-10-02Removed 'extern int DEBUGLEVEL' as it is now in the smb.h header.Tim Potter1-3/+0
(This used to be commit 2d0922b0eabfdc0aaf1d0797482fef47ed7fde8e)
2001-09-02updated copyright for Michael SweetAndrew Tridgell1-1/+1
(This used to be commit 9d53473f302f172c10854b8df3000552918d0637)
2001-08-23Fixed detection of CUPS. We need to check for the presence of the cupsTim Potter1-2/+2
header files as well as libcups. (This used to be commit 2dbb41a7b88e7fad63579111aaab4a1cd28c54d5)
2001-08-09Merged John's fix.Jeremy Allison1-1/+1
Jeremy. (This used to be commit 61141c371ae160f03c2259e2dbc0910e63890275)
2001-08-08Change all realloc() statements to Realloc() (ecxept for tdb.c)Simo Sorce1-6/+6
changed some code to exploit the fact that Realloc(NULL, size) == malloc(size) fixed some possible mem leaks, or seg faults. thanks to andreas moroder (mallocs not checked in client/client.c, client/smbumount.c) (This used to be commit 7f33c01688b825ab2fa9bbb2730bff4f2fa352be)
2001-07-23Same fix for resume as for pause.Jeremy Allison1-1/+2
Jeremy.i (This used to be commit 9444fc554ba31ef516d0d98bbfe7f1af883e3970)
2001-07-23Fix for CUPS pause/restart code.Jeremy Allison1-2/+2
Jeremy. (This used to be commit 592ef3d8eaea6421db758f39b694c84e8f66ec20)
2001-07-23Fix for cups compile.Jeremy Allison1-16/+17
Jeremy. (This used to be commit e90ad081ada5f3e11abe833b16a6416025ebcea5)
2001-07-17iFix from "Shahms E. King" <shahms@shahms.com> to get cups user nameJeremy Allison1-6/+6
right. Jeremy. (This used to be commit 34244c2a8d02d09b60dfba30b239b9764b60d35a)
2001-07-04The big character set handling changeover!Andrew Tridgell1-4/+5
This commit gets rid of all our old codepage handling and replaces it with iconv. All internal strings in Samba are now in "unix" charset, which may be multi-byte. See internals.doc and my posting to samba-technical for a more complete explanation. (This used to be commit debb471267960e56005a741817ebd227ecfc512a)
2001-03-16Added Michael Sweet's CUPS patch to call directly into the CUPS backend.Jeremy Allison1-11/+994
Parameterises the printing functions so other backends can be plugged directly in (this is a good thing :-). Jeremy. (This used to be commit c0345bbaed5d1aac777f1a33ff84ad1899f2ed6d)
2001-02-16Excise snprintf -> slprintf.Jeremy Allison1-1/+1
srv_samr.c: duplicate gid fix. srv_spoolss_nt.c: Merge of JF's work. uid.c: Fix for returning names when a PDC. Jeremy. (This used to be commit d938ad6963a2dd4eda930d508600ec1902dc2b16)
2000-12-07file_lines_load/file_lines_pload can now optionally convert unix_to_dos()Jeremy Allison1-2/+2
on read. Jeremy. (This used to be commit 76b8dd376d13eb4469417be217c966d54d333367)
1999-12-17 printing/print_cups.c from 2.0.6Andrew Tridgell1-0/+206
(This used to be commit 452776a5a7951c84437e424874ff110fc56296db)
generated by cgit (git 2.34.1) at 2024-12-28 23:07:16 +0000