summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-04-09 06:02:56 +0000
committerGerald Carter <jerry@samba.org>2003-04-09 06:02:56 +0000
commit1c2e2ba39ea03bec900db58a90803df95a91c73f (patch)
treee8a1916f478f65fcd0c55796303e9de83e857f60
parentbdca5d31c3861b58f1b02371b3913f08ead8d9a6 (diff)
downloadsamba-1c2e2ba39ea03bec900db58a90803df95a91c73f.tar.gz
samba-1c2e2ba39ea03bec900db58a90803df95a91c73f.tar.bz2
samba-1c2e2ba39ea03bec900db58a90803df95a91c73f.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 c7c3d42cd5954b040ee7027886ea8d9d0f2da9a5)
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c9
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 fec9de8990..9f943f036a 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