1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00

332 Commits

Author SHA1 Message Date
Jeremy Allison
cbaa14857b Merge of (apparently working :-) new printing notify code.
Jeremy.
(This used to be commit 8595c6ce4d74539089b600b3b0ff858a04b793ff)
2002-09-04 21:59:38 +00:00
Gerald Carter
59f40f31ed DeletePrinterDriver[Ex]() fixes from APP_HEAD
(This used to be commit 04874134ed83847988bad5fcad3463395dc283fb)
2002-09-04 01:14:24 +00:00
Gerald Carter
3cbe892276 fix up print portion of registry. Merge from APP_HEAD.
(This used to be commit ec37633548ed329c05b93499f75883d987b78f1e)
2002-08-30 14:48:33 +00:00
Gerald Carter
de3d0310e2 merge of phant0m key fix from APP_HEAD
(This used to be commit cb13d334a53f27713665570d85607d57eb407f9f)
2002-08-30 10:47:34 +00:00
Gerald Carter
6dad13d801 merge from APP_HEAD
(This used to be commit ebe89453b63467c87263c24f4380544fef1124a6)
2002-08-26 16:57:35 +00:00
Gerald Carter
68d5ab9a65 merge from APP_HEAD
(This used to be commit 4689e7ea5e55e22e1e4293c91ba69fee53436143)
2002-08-26 16:43:29 +00:00
Gerald Carter
2bd75e4714 fix registry editor API for printing backend after I changed
the NT_PRINTER_PARAM to a REGISTRY_VALUE
(This used to be commit 8d510abe125e15a8d71c58a13d170dc3d6371368)
2002-08-22 21:16:11 +00:00
Gerald Carter
c9c404b26c get the access check in addform() correct this time.
Needed to modify OpenPrinter() to store the access granted to
on the print server handle as well.
(This used to be commit 08b3f9688c6c3c83ad8949e6346d8fab5e563df4)
2002-08-22 03:12:10 +00:00
Gerald Carter
85b7d9904e addform fix from SAMBA_2_2
(This used to be commit db286e66ec4788b40e279fd230b2013f311e44ec)
2002-08-21 01:47:29 +00:00
Gerald Carter
42045afda9 segfault fixes merged from APP_HEAD
(This used to be commit cd9ee27d89a5cd489efac2029c22797ec9c383ca)
2002-08-20 03:01:37 +00:00
Gerald Carter
11b71419b0 add support for the "value,OID" format described in MSDN.
I've not seen this on a real network, but we support it now :-)
(This used to be commit 1ed6f68f6f29e1a62b12764ec5e84de8351efbd3)
2002-08-19 21:17:22 +00:00
Gerald Carter
2b93ecc90b added wrapper for delete_printer_data() that write the printer out to disk.
(This used to be commit 113d960d77fc9e3671a448d093237ced25c2e18c)
2002-08-19 02:18:48 +00:00
Gerald Carter
0231bb451d change notify fix left out of merge by APP_HEAD by accident
(This used to be commit a413ff8b494e63b42fab213f12b44df6a5f0c34c)
2002-08-19 01:56:15 +00:00
Gerald Carter
12be900ece * Fix DeletePrinterDataEx() to work with arbitrary registry keys
* Fix delete_all_printer_data() to accept a key name for partial tree
  deletions

* Fix EnumPrinterKey() to work with subkeys

* Fix DeletePrinterKey() to work with ful or partial registry
  trees

* Fix get_printer_subkeys() to return a list of unique keynames
  ( some were getting added twice due to subkeys names )

* fix a couple of typos for good measure
(This used to be commit b6ceb8c2e50b7fcdc614a3b6782db05b60689a85)
2002-08-18 16:52:51 +00:00
Gerald Carter
50d224a898 fix to allow EnumPrinterKey() to enumerate multiple levels of subkeys.
Works on the top level.  Needs more testing for levels > 1.
(This used to be commit 32a7083843f2bf9a3f32027189dbb0ff92927cd4)
2002-08-18 11:11:48 +00:00
Gerald Carter
caf8f949b6 * small formatting fixes
* Fix EnumPrinterKey() to enumerate all printer keys
  ( this will break if we have more than one level deep of printer keys )
(This used to be commit e72184ce13a5645dc1e1a137468207270ed20ed6)
2002-08-18 02:10:07 +00:00
Gerald Carter
409d7ff3f5 fixed up a few comments
removed now unused getprinterdata)printer() function
(This used to be commit 2d5e4cdc3a4128c6747350d8f66b783218045ce2)
2002-08-18 01:02:32 +00:00
Gerald Carter
66992aff21 * fix Get/SetPrinterDataEx() to work with printer key other
than SPOOL_PRINTERDATA_KEY

* created an internal set/get_printer_dataex() call for reuse in
  Set/GetPrinterData()
(This used to be commit 4eb8ffba032971cf83a0fcec7ca3730b4ded0bf0)
2002-08-18 00:59:47 +00:00
Gerald Carter
cb36e520b3 * the printing code should now be back to the working state it was
before the swap from NT_PRINTER_PARAM to REGISTRY_VALUE.

* XxxPrinterDataEx() functions have not been expanded to support
  keys other than SPOOL_PRINTERDATA_KEY yet

* fixed apparent long standing bug regarding the dependentfiles
  list in the DRIVER_INFO struct
(This used to be commit d59b0eb1236cf5bb9371030a94eb60d4131c15fb)
2002-08-17 13:17:41 +00:00
Gerald Carter
f56e06476f fix seg fault in _spoolss_enumprinterkey after changes...
add SPOOL_PNPDATA_KEY define
(This used to be commit cdaa3f55e1fcc38b1d7a63d502a9fea3b92bf193)
2002-08-17 00:38:20 +00:00
Gerald Carter
31514f67ae fix small bug in enumprinterdataex due to my changes (still more lurking
though).
(This used to be commit 2feb89601fc45dea13fe45a55a9c058726a5de84)
2002-08-16 16:46:50 +00:00
Gerald Carter
4ed429481c Fairly large change to printing code.
* removed support for PHANTOM_DEVMODE printer data

* s/NT_PRINTER_PARAM/REGISTRY_VALUE/g - This was a good bit
  of work.  Everything seems stable, but is not complete.

* support for printer data keys other than PrinterDriverData
  in the store and fetch routines.  Still needs to be plugged
  into the XxxPrinterDataEx() calls.

Tested against NT4.0 & 2k.  Like I said, it's not done, but doesn't
crash so it shouldn't upset anyone (unless you're trying to build
a Samba printer server off of HEAD).  More work to come.  Should
settle by Monday.


jerry
(This used to be commit 7ba7c04c0e961618c82c2112b9627af114c6cc42)
2002-08-16 15:36:37 +00:00
Gerald Carter
14d385439d printing change notification merge from APPLIANCE_HEAD
(This used to be commit 11ddfd9cfa550dcd3186c8aaf0cc038ce7f1791f)
2002-08-08 20:54:37 +00:00
Tim Potter
335aa54b46 Merge of incomplete rffpcnex testing code from APPLIANCE_HEAD.
(This used to be commit fe43c2ac2d2e1dd3b3a25c807d4dd379c5ac4960)
2002-08-08 04:58:19 +00:00
Gerald Carter
9f7e67c6f9 couple of minor formatting fixes to help me see better.
(This used to be commit 26027ee42ae378eef59a8ae46f5e4e44bf2d4af0)
2002-07-29 18:10:59 +00:00
Gerald Carter
d7ad31cdea merge from SAMBA_2_2
(This used to be commit c268ae460e7e6fe25b6ac1583ea6d2f233c27d0f)
2002-07-29 13:24:56 +00:00
Gerald Carter
a12ed7f506 done! printer_info_2, devicemode, sec_desc, & printer data all enumerate
and display correctly in regedit.exe.

Not sure about REG_SZ values in PrinterDriverData.  If we store these
in UNICODE, I'll have to fix up a few things.

REG_BINARY & REG_DWORD are fine.
(This used to be commit 2a30c243ec28734bbc721dfc01b743faa6f73788)
2002-07-24 08:58:03 +00:00
Tim Potter
ff667e0983 Sync with APPLIANCE_HEAD branch (whitespace, const only)
(This used to be commit 11229aa88b60d820ba714f2c793fe6932ec67a6b)
2002-07-22 21:53:36 +00:00
Tim Potter
fb5153a93b Merge from APPLIANCE_HEAD.
(This used to be commit 825cdc49dbc3e6b9d08b8e722c82cc09e2479fa1)
2002-07-22 21:40:45 +00:00
Jeremy Allison
29426b4a50 Gone back to explicit queue number passing as snum - removed encoding of
queueid in job number. This means we must have an internal tdb to store
mapping from 16 bit RAP jobid's to 32 bit RPC jobids.
Jeremy.
(This used to be commit 4ff64f69706cc94d5dba7762754d00790c476963)
2002-07-17 19:12:17 +00:00
Jeremy Allison
8ba2c4e55d We must ZERO_STRUCT before using the buffer in copy_unistr2.
Fixes addprinterdriverex.
Jeremy.
(This used to be commit d3c73e59708eeb1ee4642fb31fcfc0ec2fd28070)
2002-07-12 18:10:24 +00:00
Gerald Carter
bdfe11eaea added copyright
(This used to be commit dcb6d70706a0e86881588c3828ff5bd4d63d415f)
2002-07-11 13:17:57 +00:00
Gerald Carter
137570cb03 last check in for tonight.
* DeletePrinterDriverEx() now has the ability to delete
    driver files.  I need to do some more testing
    tro veriofy that we are in fact not deleting a file out from
    under another driver, but it looks ok so far.

  * DeletePrinterDriver() noiw deletes all versions of the
    specified driver (cversion == 0, 1, 2, 3)
(This used to be commit 17bb780e1327663fa2fcd6a3cb25dd461a29c537)
2002-07-11 04:53:39 +00:00
Gerald Carter
0aadcff8ec all that is left to do is to actually perform the
file deletion now.  I have the file list.
One more commit should do it.
(This used to be commit 7207662504f585352b0ceeb99f8998ef58db7f15)
2002-07-11 03:27:12 +00:00
Gerald Carter
496e85dd81 intermediate work on DeletePrinterDriverEx(). This call
will actually delete driver files ( not yet though I don't think).
Just wanted to get it in since Jeremy and I are both
working on nt_printing.c
(This used to be commit 3fa6c3132950c9ff1c6a532d8264ee34a6b2b0ff)
2002-07-11 01:54:26 +00:00
Gerald Carter
18742edd2a fix typo
(This used to be commit be926c3a1a7fc79af62dd1830c56e9503f89f9dd)
2002-07-08 20:30:54 +00:00
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
Jeremy Allison
82176f4d85 Address the string_sub problem by changing len = 0 to mean "no expand".
Went through and checked all string_subs I could to ensure they're being
used correctly.
Jeremy.
(This used to be commit 17cae0d683be404be69554cd0e84117bdcc56c87)
2002-07-02 06:34:27 +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
2e148c865a compile fix
(This used to be commit b07d6d4cebecd77314b123d83c7c2265eb62e1c1)
2002-06-24 20:09:34 +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
366a649d04 merge from 2.2
(This used to be commit 30a0e72572b25ddd99438b92b8ddf7f06e9ad819)
2002-06-11 03:22:32 +00:00
Tim Potter
89e9f7530a Fix compile error - doh!
(This used to be commit e80e6637064a39635faba5311f774a90b1d5ab43)
2002-06-06 01:34:04 +00:00
Tim Potter
617a551c42 Moved some notify related constants into srv_spoolss_nt.c since
they're only used there.

Added a PRINTER_NOTIFY_VERSION constant.
(This used to be commit 9d3933a59219388c209d8be4ae6decfa337d229f)
2002-06-06 01:19:56 +00:00
Tim Potter
bfa2dfaba8 Fixed out of date comment for _spoolss_rffpcnex()
(This used to be commit 7d9b8c58a63cf20d00dd7cf88cfb82aed3a47d12)
2002-06-06 00:59:52 +00:00
Gerald Carter
73bc5782d4 merge from SAMBA_2_2
(This used to be commit f0226a1d836b69d179a1a2eda79fa26911b78096)
2002-05-24 19:17:27 +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