diff options
| author | Gerald Carter <jerry@samba.org> | 2003-04-09 05:30:48 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-04-09 05:30:48 +0000 |
| commit | c618a8dae43cc45cf8686dd4235435c30b689dcd (patch) | |
| tree | ecb24f0ee3ed6a330591a0d208c0ac1b07920fbf /source3/rpc_server | |
| parent | 270f95f920f1af0ebcded49444968acffa3dfb0a (diff) | |
| download | samba-c618a8dae43cc45cf8686dd4235435c30b689dcd.tar.gz samba-c618a8dae43cc45cf8686dd4235435c30b689dcd.tar.bz2 samba-c618a8dae43cc45cf8686dd4235435c30b689dcd.zip | |
another forgotten merge sitting on my laptop from app_head; only stall open_printer when 2k client opens with admin privs & fix reply for ChangeId printer data reply
(This used to be commit 12eb3e993788eb8bc0e9eb62e60a8b55079df5ad)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index fd837cd9fb..3d2b73d571 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -1768,8 +1768,11 @@ Can't find printer handle we created for printer %s\n", name )); /* HACK ALERT!!! Sleep for 1/3 of a second to try trigger a LAN/WAN optimization in Windows 2000 clients --jerry */ - if ( RA_WIN2K == get_remote_arch() ) - usleep( 384000 ); + if ( (printer_default->access_required == PRINTER_ACCESS_ADMINISTER) + && (RA_WIN2K == get_remote_arch()) ) + { + usleep( 500000 ); + } return WERR_OK; } @@ -2463,7 +2466,7 @@ WERROR _spoolss_getprinterdata(pipes_struct *p, SPOOL_Q_GETPRINTERDATA *q_u, SPO status = WERR_NOMEM; goto done; } - **data = printer->info_2->changeid; + SIVAL( *data, 0, printer->info_2->changeid ); status = WERR_OK; } else |