From 072d39165d63b960fea583b65d9a4d110466bea8 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 12 Sep 2000 16:03:16 +0000 Subject: spoolgetprinterdriver now returns "Windows NT x86" and "Windows 4.0" driver information. Will merge into TNG. jerry (This used to be commit ae7dd77c2495d5e17f6e8da94afbe8cab3e773bb) --- source3/rpc_client/cli_spoolss.c | 2 +- source3/rpc_client/msrpc_spoolss.c | 2 +- source3/rpcclient/cmd_spoolss.c | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c index 69c3d108f0..19e269a323 100644 --- a/source3/rpc_client/cli_spoolss.c +++ b/source3/rpc_client/cli_spoolss.c @@ -414,7 +414,7 @@ uint32 spoolss_getprinterdriver(const POLICY_HND *hnd, { if (r_o.status != NT_STATUS_NO_PROBLEMO) { - DEBUG(0,("SPOOLSS_GETPRINTERDRIVER2: %s\n", get_nt_error_msg(r_o.status))); + DEBUG(3,("SPOOLSS_GETPRINTERDRIVER2: %s\n", get_nt_error_msg(r_o.status))); } *needed=r_o.needed; diff --git a/source3/rpc_client/msrpc_spoolss.c b/source3/rpc_client/msrpc_spoolss.c index ad03edeef8..a841af82d0 100644 --- a/source3/rpc_client/msrpc_spoolss.c +++ b/source3/rpc_client/msrpc_spoolss.c @@ -661,7 +661,7 @@ BOOL msrpc_spoolss_getprinterdriver( const char* printer_name, status = spoolss_getprinterdriver(&hnd, environment, level, &buffer, needed, &needed); } - report(out_hnd, "\tstatus:[%d (%x)]\n", status, status); + /* report(out_hnd, "\tstatus:[%d (%x)]\n", status, status); */ if (status!=NT_STATUS_NO_PROBLEMO) { diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index b3e7554663..392f31b625 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -463,15 +463,23 @@ uint32 cmd_spoolss_getprinterdriver(struct client_info *info, int argc, char *ar printer_name = srv_name; } + report (out_hnd, "Environment = Windows NT x86\n"); fstrcpy(environment, "Windows NT x86"); level=3; + if (msrpc_spoolss_getprinterdriver(printer_name, environment, level, station, "Administrator", ctr)) + DEBUG(5,("cmd_spoolss_getprinterdriver: query succeeded\n")); + else + report(out_hnd, "FAILED\n"); + report (out_hnd, "Environment = Windows 4.0\n"); + fstrcpy(environment, "Windows 4.0"); + level=3; if (msrpc_spoolss_getprinterdriver(printer_name, environment, level, station, "Administrator", ctr)) DEBUG(5,("cmd_spoolss_getprinterdriver: query succeeded\n")); else report(out_hnd, "FAILED\n"); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** -- cgit