diff options
| author | Gerald Carter <jerry@samba.org> | 2002-05-24 16:27:54 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-05-24 16:27:54 +0000 |
| commit | 5b76d846f87fa138e64e0526925bad5a4a51a263 (patch) | |
| tree | 42e5bb94d7d81047a6b8ab4a2bde8e559200def9 /source3/rpc_server | |
| parent | 7ff439756685a8a0b69b25f58e866e03ba0e8699 (diff) | |
| download | samba-5b76d846f87fa138e64e0526925bad5a4a51a263.tar.gz samba-5b76d846f87fa138e64e0526925bad5a4a51a263.tar.bz2 samba-5b76d846f87fa138e64e0526925bad5a4a51a263.zip | |
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)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index c4a8d3917c..3f86768379 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -1510,7 +1510,11 @@ static BOOL getprinterdata_printer_server(TALLOC_CTX *ctx, fstring value, uint32 *type = 0x4; if((*data = (uint8 *)talloc(ctx, 4*sizeof(uint8) )) == NULL) return False; +#ifndef EMULATE_WIN2K_HACK /* JERRY */ SIVAL(*data, 0, 2); +#else + SIVAL(*data, 0, 3); +#endif *needed = 0x4; return True; } @@ -3004,7 +3008,7 @@ static BOOL construct_printer_info_0(PRINTER_INFO_0 *printer, int snum) printer->global_counter = global_counter; printer->total_pages = 0; -#if 0 /* JERRY */ +#ifndef EMULATE_WIN2K_HACK /* JERRY */ printer->major_version = 0x0004; /* NT 4 */ printer->build_version = 0x0565; /* build 1381 */ #else @@ -5257,8 +5261,6 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level, if (!strequal(printer->info_2->location, old_printer->info_2->location)) msg.flags |= PRINTER_MESSAGE_LOCATION; - ZERO_STRUCT(msg); - msg.low = PRINTER_CHANGE_ADD_PRINTER; fstrcpy(msg.printer_name, printer->info_2->printername); |