1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-15 23:24:37 +03:00

37 Commits

Author SHA1 Message Date
Gerald Carter
f9a28748cf r5359: BUG 2333: use the lpq command to pass in the correct printer name for cups_queue_get(). See comments in code for details
(This used to be commit 3eee00e0d0e9b58cdd35209691072b625813681c)
2007-10-10 10:55:39 -05:00
Gerald Carter
f0df38a4e8 r5012: fix segfault caused by using a ipp_t * after calling cupsDoRequest()
(This used to be commit 0ac3c4c5a231c314213dbce29e25911ddb04de2d)
2007-10-10 10:55:11 -05:00
Gerald Carter
4417bf44ad r4907: remove unreached code
(This used to be commit 15fd4a05ec2439f41591ee8a1c30021d9a34371b)
2007-10-10 10:55:07 -05:00
Gerald Carter
fd2ad84d7b r4902: please note that cupsDoRequest() deletes the request* so don't call ippDelete(request) *ever*
(This used to be commit f65598b3b0dc99900d547eb67473cca5d371614f)
2007-10-10 10:55:07 -05:00
Jeremy Allison
90c5c93ded r4881: Varient of Lar's patch for #2270. Jerry promises to test :-).
Jeremy.
(This used to be commit 2afe2a16c92bb2500854b8e288c1d7704ede704a)
2007-10-10 10:55:06 -05:00
Gerald Carter
d097ea4905 r4539: patch from Rob -- adding real printcap name cache function to speed up printcap reloads
(This used to be commit 1cad5250932b963c2eb9b775221b13db386d601b)
2007-10-10 10:53:46 -05:00
Jeremy Allison
acf9d61421 r4088: Get medieval on our ass about malloc.... :-). Take control of all our 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-10 10:53:32 -05:00
Gerald Carter
8fe6d35761 r4030: patch from Rob -- don't force the cups printer-make-and-model tag as the comment for autoloaded printers
(This used to be commit 26bbad62b9cfef4f2bb5cd3f2b2b7d13017e6439)
2007-10-10 10:53:29 -05:00
Gerald Carter
293136c04b r3067: patch based on volker's initial work in trunk that fixes the queu update problem when using the background daemon
(This used to be commit de7af09e727e744aa27af85ef7c0f73ed5c1550a)
2007-10-10 10:53:00 -05:00
Volker Lendecke
e707189db3 r979: Implement the 'cups server' option. This makes it possible to have virtual
smbd's connect to different cups daemons.

Volker
(This used to be commit 148dc71ea5c1ec619ba6f4873fa7c69a608e58cc)
2007-10-10 10:51:52 -05:00
Gerald Carter
578a7d254f r242: adding 'cups options' parameter to allow raw printing without changing /etc/cups/cupsd.conf -- documentation to follow
(This used to be commit 2f323b0991c37022fb59ef8c69454eff03296662)
2007-10-10 10:51:15 -05:00
Gerald Carter
055750f090 allow users to delete jobs with cups printing backend
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-25 19:16:35 +00:00
Gerald Carter
c26aa9fd2d patch from Matthias Hilbig for bug 467; use the dns name (or IP) as the originating client name when using CUPS
(This used to be commit 71333299a6e6bc6d74d2172f71e3fe21ef75aa3c)
2003-11-24 18:37:19 +00:00
Andrew Tridgell
e1c468477c a small include file rearrangement that doesn't affect normal
compilation, but that allows Samba3 to take advantage of pre-compiled
headers in gcc if available.
(This used to be commit b3e024ce1da7c7e24fcacd8a2964dd2e4562ba39)
2003-11-12 01:51:10 +00:00
Andrew Bartlett
8a20407442 Cleanups: (merge from HEAD)
- 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-10 11:47:21 +00:00
Gerald Carter
0adfd3d418 CUPS patch to log client name
(This used to be commit d4168c327bc42efc392561aeeef4edd702b3d653)
2003-02-05 06:37:27 +00:00
Gerald Carter
f473388887 CUPS-PRINTER_CLASS patch from Michael Sweet
(This used to be commit 8d0bde43156f5511df7a5a6865b361ebc2a933eb)
2003-01-28 01:58:38 +00:00
Gerald Carter
99cdb46208 *lots of small merges form HEAD
*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)
2003-01-15 18:57:41 +00:00
Tim Potter
f3e3a56ea9 Merge a bunch of trivial changes from HEAD. The difference remaining
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-11-29 02:58:59 +00:00
Gerald Carter
a834a73e34 sync'ing up for 3.0alpha20 release
(This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 15:19:00 +00:00
Andrew Tridgell
e90b652848 updated the 3.0 branch from the head branch - ready for alpha18
(This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 10:35:28 +00:00
John Terpstra
0b7f9e7a7c Fix ability to compile with CUPS support.
(This used to be commit 208c62c5a7bca68f223b5832d7971c3d38cb6820)
2002-03-17 22:40:51 +00:00
Jeremy Allison
02eda2e251 Tidyups when I was doing the big merge...
Jeremy.
(This used to be commit 9148bb9eaa67de60c3b0b4709a9c05a840c20c66)
2001-11-17 03:19:17 +00:00
Tim Potter
dc1fc3ee8e Removed 'extern int DEBUGLEVEL' as it is now in the smb.h header.
(This used to be commit 2d0922b0eabfdc0aaf1d0797482fef47ed7fde8e)
2001-10-02 04:29:50 +00:00
Andrew Tridgell
95739423d0 updated copyright for Michael Sweet
(This used to be commit 9d53473f302f172c10854b8df3000552918d0637)
2001-09-02 22:39:03 +00:00
Tim Potter
d1f53e4044 Fixed detection of CUPS. We need to check for the presence of the cups
header files as well as libcups.
(This used to be commit 2dbb41a7b88e7fad63579111aaab4a1cd28c54d5)
2001-08-23 19:06:20 +00:00
Jeremy Allison
f0ce79331f Merged John's fix.
Jeremy.
(This used to be commit 61141c371ae160f03c2259e2dbc0910e63890275)
2001-08-09 18:20:43 +00:00
Simo Sorce
2f844bf447 Change all realloc() statements to Realloc() (ecxept for tdb.c)
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-08-08 16:54:16 +00:00
Jeremy Allison
cab11894ec Same fix for resume as for pause.
Jeremy.i
(This used to be commit 9444fc554ba31ef516d0d98bbfe7f1af883e3970)
2001-07-23 20:47:55 +00:00
Jeremy Allison
c0d02ca380 Fix for CUPS pause/restart code.
Jeremy.
(This used to be commit 592ef3d8eaea6421db758f39b694c84e8f66ec20)
2001-07-23 20:40:16 +00:00
Jeremy Allison
6b53da146e Fix for cups compile.
Jeremy.
(This used to be commit e90ad081ada5f3e11abe833b16a6416025ebcea5)
2001-07-23 19:50:36 +00:00
Jeremy Allison
e091298907 iFix from "Shahms E. King" <shahms@shahms.com> to get cups user name
right.
Jeremy.
(This used to be commit 34244c2a8d02d09b60dfba30b239b9764b60d35a)
2001-07-17 00:39:07 +00:00
Andrew Tridgell
87fbb7092b The big character set handling changeover!
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-07-04 07:15:53 +00:00
Jeremy Allison
65d35749b7 Added Michael Sweet's CUPS patch to call directly into the CUPS backend.
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-03-16 05:55:30 +00:00
Jeremy Allison
fd46817f0b Excise snprintf -> slprintf.
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)
2001-02-16 19:21:18 +00:00
Jeremy Allison
cf5b71994d file_lines_load/file_lines_pload can now optionally convert unix_to_dos()
on read.
Jeremy.
(This used to be commit 76b8dd376d13eb4469417be217c966d54d333367)
2000-12-07 19:26:04 +00:00
Andrew Tridgell
f6cf850f16 printing/print_cups.c from 2.0.6
(This used to be commit 452776a5a7951c84437e424874ff110fc56296db)
1999-12-17 01:46:15 +00:00