1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-15 05:57:49 +03:00

175 Commits

Author SHA1 Message Date
Gerald Carter
e247cb8239 added parsing routines for SPOOLSS_ADDPRINTERDRIVEREX and
SPOOLSS_DELETEPRINTERDRIVEREX.  Ran them through some testing.
I know I'm off by 2 x uint32's in the former RPC.
(This used to be commit 55fbfd02ba917b74fd4df7a1aa8cc8c5a91e3e07)
2002-07-08 20:15:47 +00:00
Gerald Carter
100b8986ea * basic implementation of SPOOLSS_DELETEPRINTERDATAEX and
SPOOLSS_DELETEPRINTERKEY
* stub funnctions for SPOOLSS_ADDPRINTERDRIVEREX and
  SPOOLSS_DELETEPRINTERDRIVEREX
(This used to be commit d675974d0c04a68d48d90492005056d96697c96c)
2002-07-08 18:34:55 +00:00
Tim Potter
5106ead0e0 Merge of constant renames from APPLIANCE_HEAD.
(This used to be commit daf4c6a013ffa474d768055e73a1cb31ee941e80)
2002-07-02 04:07:32 +00:00
Jeremy Allison
452eb38df0 Proper merge of all the working printing stuff from APPLIANCE_HEAD.
Now let's keep this in sync !
Jeremy.
(This used to be commit 3603cd4947df2c10df604447dc542932cb9e5d5a)
2002-06-28 00:17:15 +00:00
Gerald Carter
8587400d28 a null grp_sid should have a 0 offset. Also removed a few more unnecessary
prs_align() for sec_desc.
(This used to be commit fc3770f281f6344a0589bfe614cd3e559b7259dd)
2002-06-27 01:12:37 +00:00
Gerald Carter
900fb62238 printing merge from SAMBA_2_2. Ther server code looks to be in sync now.
Mostly formatting and s/free/SAFE_FREE/g changes with the two exceptions
being

  * John driver init changes
  * Tim's printer enumeration bug fix
(This used to be commit f7536762863811f96364e8acd3716bdb7d665bbf)
2002-06-24 19:51:23 +00:00
Simo Sorce
a60e37096d more debug classess activated
(This used to be commit 897e64d2e0c1d04ab93441ccaffe369bf43be46e)
2002-06-18 09:20:13 +00:00
Gerald Carter
5b76d846f8 merge from SAMBA_2_2.
Tim, please check the prs_align() removed from sec_io_desc()
and make sure it doesn't break anything else.  I know it is
right for the printing needs and I have tested some other
general things like viewing acls on directories, but I would
feel more comfortable if you would have a look as well.


jerry
(This used to be commit 83f109c940f30d9b35176540d8bdccbb22ffa3a1)
2002-05-24 16:27:54 +00:00
Tim Potter
c1334b143b OK that last commit was incorrect - this call is parsed properly. I only
imagined it wasn't!
(This used to be commit bbad6c6678c89a33fb233091f5965ccd1aa589f6)
2002-05-20 01:31:51 +00:00
Tim Potter
622ed701a5 There's probably a pointer to a buffer at the end of a enumprinterdrivers()
rpc call which we currently don't parse - just added a comment about it for
the moment as not parsing it is harmless.
(This used to be commit 2429c4cc796576aa2d816a14b10fdd932b672a02)
2002-05-20 01:00:56 +00:00
Tim Potter
077566a200 No need to pass a fstring in make_spoolss_q_enumprinters()
(This used to be commit 1fb8e2b3a07fdc0bb302f02a451ed32a275f0c10)
2002-05-20 00:55:19 +00:00
Tim Potter
af451af22f Added deleteprinterdata client rpc.
(This used to be commit 217ae50acd8cf088e268e7d2a6a7c192aca9e2f1)
2002-05-14 07:21:57 +00:00
Tim Potter
3d95426f2c Added writeprinter rpc command.
(This used to be commit a1934a7a8eda592e283a01014280ddb373564927)
2002-05-14 06:37:54 +00:00
Tim Potter
4deb561254 Change make_spoolss_q_{get,set}printerdata() take a char* and length rather
than a unistr2.  Printer data isn't necessarily in unistr format.

Tallocate memory to hold returned data when unmarshalling getprinterdata
and enumprinterdata replies.
(This used to be commit 89633a1d87d2a437dc1ceab9439f415ee1ec606d)
2002-05-14 05:32:45 +00:00
Gerald Carter
d53afaaff1 compile fix merge from SAMBA_2_2
(This used to be commit 2676be4e419878fbf74b619949e1d84c6186691c)
2002-05-13 14:41:55 +00:00
Tim Potter
787b58835c Support for client side startdocprinter.
Set useless_ptr = 1 for marshalling smb_io_doc_info() so it actually works.
(This used to be commit 8e09e9454685f4638375247fdb4a1e7c6de91704)
2002-05-13 03:18:19 +00:00
Gerald Carter
c6cbca79b4 misc merge from SAMBA_2_2
(This used to be commit 0420098c47555224d2425845137e4159698e02c2)
2002-05-10 16:19:53 +00:00
Gerald Carter
9992378e55 devmode parsing merge from SAMBA_2_2
(This used to be commit 59e49a79b485f5ba26dedff8a7d7fe1c8c77f16a)
2002-05-10 16:19:05 +00:00
Tim Potter
26b0e0b478 Added client side spoolss rpc commands for startpageprinter,
endpageprinter, setjob and getjob.
(This used to be commit d091a9d300c70b708218067d355c8282a6f14ab6)
2002-05-08 05:48:32 +00:00
Gerald Carter
dde9187728 merge from SAMBA_2_2
(This used to be commit 5e381abbbfaa15f3ebd89cba3cd9bb6de8e4ff4e)
2002-04-22 18:47:36 +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
Andrew Tridgell
19fea3242c the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work
(This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 07:13:01 +00:00
Simo Sorce
2e783a4707 this is a big global fix for the ptr = Realloc(ptr, size) bug.
many possible mem leaks, and segfaults fixed.

someone should port this fix to 2.2 also.
(This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 17:30:01 +00:00
Jeremy Allison
4b2016305b Merge in the NT drivers changes from 2.2.
Jeremy.
(This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 19:38:53 +00:00