1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00

152 Commits

Author SHA1 Message Date
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
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
Herb Lewis
c2cfcb34e1 SGI compiler fixes.
Jeremy
(This used to be commit 45bf995bf62aa6cc176d57e2f954cc2d379717ef)
2001-06-26 20:23:45 +00:00
Jeremy Allison
3a6019b0eb Merging Gerry's spoolss changes.
Jeremy.
(This used to be commit 6b4a70cd8285c1e4d452e3af7df070b4c446ff54)
2001-06-21 17:46:14 +00:00
Gerald Carter
013b454d1a merge from 2.2 DeletePrinterDriver() server side stud coming
in separate commit after I get it working in 2.2.
(This used to be commit 09506ac0e64b84d73e3b8fdd4942fa52dba6060f)
2001-05-17 18:57:25 +00:00
Gerald Carter
e40449fa72 rpcclient merge from 2.2 (including Jeremy's non-void return fix)
(This used to be commit 0a6ceed279cc8111008b21f75c6791efbd993f4b)
2001-04-28 00:32:56 +00:00
Jeremy Allison
2ef68c7e92 Merge of Andrew's changes in 2.2.
Jeremy.
(This used to be commit fc76681812b1469208ad6c8847afdfc68bc6db49)
2001-04-13 19:12:06 +00:00
Jeremy Allison
9f793948bd include/ntdomain.h:
rpc_server/srv_lsa_hnd.c: Remove back pointer from policy handle list as the pipe
						that opened the handle may have been closed. We were dereferencing
						into something that had been closed.
rpc_parse/parse_spoolss.c: Sync up with Gerald's changes in 2.2.
lib/replace.c: Don't do proto on setlinebuf as it differs between systems.
Jeremy.
(This used to be commit 887ef3e12dc56b89b2284d42b16a81f03e15110b)
2001-04-02 22:27:40 +00:00
Gerald Carter
738a83a14f rename of 16 new_smb_io functions to smb_io_* for consistency sake
(merge from 2.2)
(This used to be commit ea963a648b889da9e47661c61c7fafe13b277e75)
2001-03-28 16:08:00 +00:00
Gerald Carter
25d975e550 merge from 2.2.
(This used to be commit 817258f1174d27d74e8b21ffb5f1384db2238007)
2001-03-27 18:19:01 +00:00
Gerald Carter
344fb49fbf reverted the rename of new_spoolss_io_r_enumprinterdrivers()
(This used to be commit fd6bfe03f4454272bdce59c78ae7148a72caaf18)
2001-03-19 18:14:09 +00:00
Gerald Carter
c09fe5e157 whoops...forgot one
(This used to be commit f37ba49c28b617c5750344eff0b221512445908e)
2001-03-15 22:08:26 +00:00
Gerald Carter
a9dda48d65 renamed one of the enumprinterdrivers parsing functions
for consistency sake.
(This used to be commit cbce0c935099231af51a34460c6b331822fde213)
2001-03-15 07:11:18 +00:00
Jeremy Allison
da3053048c Merge of new 2.2 code into HEAD (Gerald I hate you :-) :-). Allows new SAMR
RPC code to merge with new passdb code.
Currently rpcclient doesn't compile. I'm working on it...
Jeremy.
(This used to be commit 0be41d5158ea4e645e93e8cd30617c038416e549)
2001-03-11 00:32:10 +00:00
Jeremy Allison
00ab9021b0 Serious (and I *mean* serious) attempt to fix little/bigendian RPC issues.
We were reading the endainness in the RPC header and then never propagating
it to the internal parse_structs used to parse the data.
Also removed the "align" argument to prs_init as it was *always* set to
4, and if needed can be set differently on a case by case basis.
Now ready for AS/U testing when Herb gets it set up :-).
Jeremy.
(This used to be commit 0cd37c831d79a12a10e479bf4fa89ffe64c1292a)
2001-03-09 23:48:58 +00:00
Jeremy Allison
7d85361533 rpc_parse/parse_spoolss.c: Fixed memory leak introduced by restructuring.
rpc_server/srv_spoolss_nt.c: Fixed problem with printer snum being read uninitialised.
Jeremy.
(This used to be commit 1552db715da576b41060f0d31d2c4cdec790c1d4)
2001-03-01 03:04:13 +00:00
Jeremy Allison
c014d3b709 Remove unused code.
Jeremy.
(This used to be commit 3495d5cc3ba0f380fc78389b9ba17235ccd97ae4)
2001-03-01 00:40:25 +00:00
Jeremy Allison
0f2799aaf1 Move to talloc control of SPOOL_XXX structs. Move to talloc control of
security descriptors and pointers. Syncup with 2.2 tree.
Jeremy.
(This used to be commit 14d5997dc841e78a619e865288486d50c245896d)
2001-02-28 00:51:02 +00:00
Jeremy Allison
5265ce7837 Added total memory allocated counter to talloc, so we can tell if a talloc
pool is getting bloated. Also added a talloc_zero function to return zeroed memory.
Added debug in rpc_server/srv_pipe_hnd.c so we know when a talloc pool is being
freed. Syncup with srv_pipe_hnd.c from 2.2 so we are freeing memory at the same time.
Jeremy.
(This used to be commit d3a56c6042acf037bbd53de88d7636a5803ead20)
2001-02-27 19:22:02 +00:00
Jeremy Allison
94fc44a93c Merge of JohnR's changes to appliance-head, JF's changes to 2.2,
updated the POSIX_ACL code to be in sync.
Jeremy.
(This used to be commit c0517d6f4e3079feca1309fd1ea7b21e83f0de02)
2001-02-12 16:18:02 +00:00
David O'Neill
22363b9d78 Changes from APPLIANCE_HEAD:
source/include/proto.h
    source/include/rpc_spoolss.h
    source/rpc_parse/parse_spoolss.c
    source/rpc_server/srv_spoolss.c
    source/rpc_server/srv_spoolss_nt.c
        - speedups in printer queue enumeration  - still room for
          improvement.  The construct_dev_mode() still creates and destroys
          a printer info_2 structure every time it is called.
        - fixed job->devmode memory leak
        - converted printer job notification routines to use tallocated
          memory rather than a fixed 2K buffer.   This reduces the memory
          requirements of a 4500 job queue enumeration from 90MB to about
          16MB.
(This used to be commit 7853b27bc1765d48d5f06837f8aca71a3a0d1e5d)
2001-01-17 22:55:02 +00:00
Tim Potter
ee49ddbd8f Printer name unistr is null terminated in make_spoolss_q_open_printer_ex()
(This used to be commit a125eba0aac2bc6b37322a1e38e46eaac7e20d3a)
2001-01-12 19:45:50 +00:00
Jeremy Allison
6003be4856 ADDPRINTERDRIVER info level 6 fix - this is dynamic depending
on a field in the struct - that's why it was so hard to find.
Jeremy.
(This used to be commit 0ab6eb01b0d15e5eb744333d2bd79c27451f50e3)
2000-11-22 01:26:09 +00:00
Jeremy Allison
2bd3a436fd Fix for updating of print queues changed from a local box. Essentially,
this makes sure that the change messages sent to ourselves are handled
synchronously w.r.t. other smb packets incoming.
Jeremy.
(This used to be commit 78a13074455618308d048d1c69f62e660988eb90)
2000-11-21 00:30:15 +00:00