1
0
mirror of https://github.com/samba-team/samba.git synced 2025-06-21 03:17:08 +03:00

228 Commits

Author SHA1 Message Date
Gerald Carter
281e293331 * Fix from SATOH Fumiyasu for bug 660 (failing to view print
jobs) by only enforce the 'max reported print jobs' parameter
  when it is non-zero.

* Fixed bug 338 by making sure that data values are written
  out when we are marshalling an EnumPrinterDataEx() reply.
  This probably fixes other bugs reported against point-n-print
  feature in 3.0.0
(This used to be commit fd98af75d655449a677360f6991da5caabc88b4d)
2003-11-13 20:15:17 +00:00
Jeremy Allison
d3b9384308 Fix for #480. Change the interface for init_unistr2 to not take a length
but a flags field. We were assuming that 2*strlen(mb_string) == length of ucs2-le string.
This is not the case. Count it after conversion.
Jeremy.
(This used to be commit f82c273a42f930c7152cfab84394781744815e0e)
2003-09-25 21:26:16 +00:00
Herb Lewis
062f89bc28 get rid of some sompiler warnings on IRIX
(This used to be commit a6a39c61e8228c8b3b7552ab3c61ec3a6a639143)
2003-08-15 01:42:30 +00:00
Tim Potter
9e51951e6e Don't bomb out when trying to unmarshall a zero length printerdata value.
Fixes remote printer publishing of shared printers from a Samba server.
(This used to be commit 7f363fa32d3b660567fc87d5d0b1e1d4dd58461a)
2003-07-14 05:13:30 +00:00
Gerald Carter
fb82535d1f fix bug #178; available space in devmode should be int
(This used to be commit 944480b89a829f159cabff100d83a72400aa6b6c)
2003-06-23 17:47:25 +00:00
Tim Potter
03412f056d Whitespace syncup.
(This used to be commit 7fd7af121ee8ba4f9540394f64fe3c78e2e96cd2)
2003-04-28 05:47:07 +00:00
Andrew Bartlett
2a3a9f0bf4 Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted
a pstrcpy/fstrcpy or at most a safe_strcpy().

These have the advantage of being compiler-verifiable.

Get these out of the way, along with a rewrite of 'get_short_archi' in the
spoolss client and server.  (This pushes around const string pointers, rather
than copied strings).

Andrew Bartlett
(This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 13:27:35 +00:00
Gerald Carter
ccb58b303a add #define for the max device name length in a DEVICEMODE
(This used to be commit 52ef84b53495db1eac6ecfb0b926ef8df7ea5cc5)
2003-03-06 16:09:11 +00:00
Gerald Carter
d95f1e4260 * CR1868: only send a change notify message if we have something
that changed that the client is monitoring.

* couple of comments abnout how we need to validate driver names
  on SetPrinter() and AddPrinter()

* up the debug level on some overly verbose dev mode parsing messages
(This used to be commit e8939165b77c9e2ea8b3cef2e85885b9812c7184)
2003-03-03 16:32:03 +00:00
Tim Potter
1788f806e7 Merge: const fixes.
(This used to be commit a20aba09996e470425a151271237f2d48a8302af)
2003-02-25 23:51:56 +00:00
Gerald Carter
23b3b29eec Progress on CR 601
cache the printer_info_2 with the open printer handle.
cache is invalidated on a mod_a_printer() call **on that smbd**.

Yes, this means that the window for admins to step on each other
from different clients just got larger, but since handles a generally
short lived this is probably ok.
(This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 20:53:53 +00:00
Gerald Carter
380635538b couple of merges from APP_HEAD
* performance optimization in enumprinterdataex() when keyname is empty
  * fix a few typos in comments
  * reload services after addprinter_command()

dump registry data in ascii when the key is REG_SZ or REG_MULTI_SZ
(This used to be commit 3fc90ea1d9b11186f26484516a4dd8502b6d7323)
2003-02-21 17:04:01 +00:00
Andrew Bartlett
634c54310c Merge from HEAD - make Samba compile with -Wwrite-strings without additional
warnings.  (Adds a lot of const).

Andrew Bartlett
(This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
2003-01-03 08:28:12 +00:00
Tim Potter
48461eb42a Merge of comment about apparent spoolss_io_user_info weirdness.
(This used to be commit 872c152d35d5b7d1dc8a1d259c668f9bf42fc979)
2002-12-20 01:27:22 +00:00
Jim McDonough
b32000da50 Support printer info 7, used for publishing
(This used to be commit 60502d9d4274ddb3756b79593125544683c45908)
2002-12-03 19:48:27 +00:00
Jim McDonough
397873f0c4 Sync with HEAD to get enumprinterkey api.
(This used to be commit f6e21ba4c724f77586ef428f82126d209b0a9607)
2002-11-08 20:36:31 +00:00
Jeremy Allison
9304248788 Merge of scalable printing code fix... Needs testing.
Jeremy.
(This used to be commit d030df76439c72825d68410211e62090438cef54)
2002-11-07 02:15:35 +00:00
Tim Potter
788ca8b118 Merge NULL relstr fix from HEAD.
(This used to be commit 0f2ddfcd95acec964a3a7652968c9469ac486814)
2002-10-17 06:44:33 +00:00
Jeremy Allison
e72ea543ee HEAD and APP-HEAD spoolss parsing was out of sync. This MUST NOT HAPPEN !
Jeremy.
(This used to be commit cb89bcc935a39d9ca1ceb07a4ca85f0bda7f65fe)
2002-09-27 18:49:51 +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
Jelmer Vernooij
b2edf254ed sync 3.0 branch with head
(This used to be commit 3928578b52cfc949be5e0ef444fce1558d75f290)
2002-08-17 17:00:51 +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
Gerald Carter
2699f9b9df printing merge from HEAD
(This used to be commit d3aed37dd87d425f51bcdc4e5151f0b0fe8f9c6b)
2002-04-22 18:48:45 +00:00
Jeremy Allison
440a0099ea HP2500C driver writes devmode with private data that ends
on a 2 byte boundary. We then miss-parse the desired_access. Also added
other fixes to ensure we align after private data (discussed with Gerry).
Jeremy.
(This used to be commit 4369a58765f382e118e5393c805336484671cbf9)
2002-04-11 18:52:09 +00:00
Gerald Carter
b40e73e2ca specversion merge from SAMBA_2_2
(This used to be commit d87aa35d482824df7b5a2e87240ae43c113cc730)
2002-04-11 01:48:38 +00:00
Tim Potter
b99d3f27df Fixed missing alignment in spoolss_io_q_enumjobs() function.
(This used to be commit e878cdc9f59084f39c022f2faa140369f76e94ec)
2002-04-10 07:21:03 +00:00
Tim Potter
b408c4c5c0 The useless_ptr must be non-zero for addform and setform client functions
to work.

Note about setprinter level 1 not existing.
(This used to be commit 6367bfc4781a678923f1fba4681c9b7fc6bb9710)
2002-04-09 03:36:12 +00:00
Gerald Carter
737423f06e OpenPrinter() merge from 2.2
(This used to be commit 619397cc90549d4602ecddc25ee50eb247c913ee)
2002-03-26 03:15:30 +00:00
Gerald Carter
826f3fb86b resetprinter merge from SAMBA_2_2
(This used to be commit 88d8897e21749f177952b264031aa386bbbeaaeb)
2002-03-20 03:37:27 +00:00
Gerald Carter
65c007b583 syncing up printing code with SAMBA_2_2 (already done some merges
in the reverse).

  * add in new printer change notify code from SAMBA_2_2

  * add in se_map_standard() from 2.2 in _spoolss_open_printer_ex()

  * sync up the _print_queue_struct in smb.h (why did someone change the
    user/file names in fs_user/fs_file (or vice-versa) ? )

  * sync up some cli_spoolss_XXX functions
(This used to be commit 5760315c1de4033fdc22684c940f18010010924f)
2002-03-15 08:14:10 +00:00
Tim Potter
aad2072e07 Remove studly gaps from prs_werror() calls so the same debug text is
logged.  This makes it much easier to use grep on log files when searching
for errors.
(This used to be commit ab1ebd377931166f2ecded784a0182102d4c1ca2)
2002-03-14 02:48:03 +00:00
Tim Potter
bb117fdca7 Implemented client side functions for SPOOLSS addform, getform, setform and
enumforms.
(This used to be commit e69222f0816878e3211e3dedb049de50ca90fed0)
2002-02-25 06:43:31 +00:00
Tim Potter
a630f289f5 Added make functions for SPOOL_Q_{ADD,SET,DELETE}FORM.
I'm pretty sure that the useless_ptr in spoolss_io_q_setform() needs to be
initialised to 1 otherwise the form isn't marshalled at all.  JF, can you
verify this?  If so then this probably applies to the io functions for
setform and deleteform.
(This used to be commit 1803778451a344c6c8d116eac5eaac777e5cf4fe)
2002-01-31 11:42:16 +00:00
Tim Potter
cd68afe312 Removed version number from file header.
Changed "SMB/Netbios" to "SMB/CIFS" in file header.
(This used to be commit 6a58c9bd06d0d7502a24bf5ce5a2faf0a146edfa)
2002-01-30 06:08:46 +00:00
Jeremy Allison
5b0dca4998 Fixed ADDPRINTEREX to take a devmode and a security descriptor...
Jeremy.
(This used to be commit 27f65b3aad13ecd33bbb84048d70e3dde212f278)
2002-01-26 01:20:38 +00:00
Jeremy Allison
2a3673994d Added prs_mem_clear(). Clear memory on buffer reallocation. That way
we're not returning what the client gave us.
Jeremy.
(This used to be commit 9a969069f132019cdd8a11be2b00356a3f09b64d)
2002-01-18 00:36:16 +00:00
Jeremy Allison
c9d350a736 Added PRINTER_INFO_4/PRINTER_INFO_5, we're seeing level 5 requested on the wire... so.
Jeremy.
(This used to be commit b63b76297835ab8227b98925fa8120ffce1a37d9)
2002-01-12 02:37:54 +00:00
Tim Potter
17729f5dc5 Sed error. The status value in the PRINTER_INFO_2 structure isn't a WERROR
but a plain old uint32.
(This used to be commit 690cc12bad2a037684a43b0dcb48be8eb03aa7bc)
2002-01-07 06:13:40 +00:00
Gerald Carter
f7e4e37c63 merge from 2.2
(This used to be commit 72d3b160229ce9ab8497579ee79668738a70a81f)
2001-12-20 15:09:23 +00:00
Tim Potter
0be611c8dc Replaced some hardcoded hex numbers with constants.
Made a note about NOTIFY_OPTION_TYPE and NOTIFY_OPTION_TYPE_DATA - they are
actually one structure.  The latter is just the deferred referrant of the
former.
(This used to be commit b596c0b171b1fd0e25e52944c880e8a90bc10a2e)
2001-12-17 01:53:02 +00:00
Gerald Carter
037b40f01f merge from 2.2
(This used to be commit 5b4b3323a3fbabbb3c7db5eb3b11999bbde470b1)
2001-12-13 17:18:15 +00:00
Tim Potter
4f53486d78 Added client and server code for the GetPrintProcessorDirectory SPOOLSS
rpc.  This was supposed to fix a printer driver download bug but it didn't
but it seemed a shame to trash all this code so I'm commiting it #ifdef'ed
out in case someone needs it one day.
(This used to be commit bef43656471741c6c10b12e7516c15de9ae76394)
2001-12-10 05:03:17 +00:00
Gerald Carter
bd8e916cb5 merge from APPLIANCE_HEAD
(This used to be commit c60aa6c06f376684b6d6d9a2c14305ca9f4657ef)
2001-11-28 21:51:11 +00:00
Gerald Carter
59b2e772e2 remove unused variables
(This used to be commit 90ed3d47e16a511161532f75b98db3f4b10ba685)
2001-11-22 06:44:05 +00:00
Gerald Carter
116740a5df merge from 2.2
(This used to be commit 96b3a65a73d403a41bf1b3aba79bd743698344ac)
2001-11-22 05:56:09 +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
Martin Pool
fea97ecd7c spoolss_io_devmode private data is binary and should be shown in hex,
not ascii.
(This used to be commit be5d32eb9c58bb1911299d095efcf230d50ed590)
2001-11-08 03:12:22 +00:00
Tim Potter
7623cec4ad Wrote some stubs for new win2k only spoolss rpc commands:
GetPrinterDataEx() and SetPrinterDataEx().  Not sure what the command
number is for the latter is - I haven't seen it on the wire yet.
(This used to be commit 87614c74b3d66cf2ca706b33e6cf0a32b4166e7a)
2001-11-05 06:15:02 +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
Simo Sorce
e7db47bffb move to SAFE_FREE()
(This used to be commit 94b0fde8a8a4e888cee93ebde79390c7942a2785)
2001-09-17 10:00:29 +00:00