another forgotten merge sitting on my laptop from app_head; only stall open_printer...

(This used to be commit 12eb3e993788eb8bc0e9eb62e60a8b55079df5ad)

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index fd837cd9fb43511ffa90ae49d05f26edf6e40714..3d2b73d571c09f254a5aa8a7a1e1b03932587b59 100644 (file)
--- 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