adding more spoolss command into rpcclient. They don't all work

currently.  More to come later.


--jerry
(This used to be commit 0faf21662db5b24b7fd57736ea53772e3baca5df)

2 files changed, 368 insertions, 2 deletions

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 9e31be86de..2f0fb77ac1 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -94,3 +94,371 @@ uint32 cmd_spoolss_enum_printers(struct client_info *info, int argc, char *argv[
 		
 	return NT_STATUS_NOPROBLEMO;
 }
+
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+uint32 cmd_spoolss_enum_printerdata(struct client_info *info, int argc, char *argv[])
+{
+	fstring srv_name;
+	fstring station;
+	char *printer_name;
+
+	if (argc < 1) {
+		report(out_hnd, "spoolenumdata <printer name>\n");
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	printer_name = argv[1];
+
+	fstrcpy(station, "\\\\");
+	fstrcat(station, info->myhostname);
+	strupper(station);
+
+	fstrcpy(srv_name, "\\\\");
+	fstrcat(srv_name, info->dest_host);
+	strupper(srv_name);
+
+	if (!strnequal("\\\\", printer_name, 2))
+	{
+		fstrcat(srv_name, "\\");
+		fstrcat(srv_name, printer_name);
+		printer_name = srv_name;
+	}
+
+	DEBUG(4,("spoolopen - printer: %s station: %s user: %s\n", printer_name, station, usr_creds->ntc.user_name));
+
+	if (msrpc_spoolss_enum_printerdata( printer_name, station,
+	                        usr_creds->ntc.user_name))
+	{
+		DEBUG(5,("cmd_spoolss_enum_printerdata: query succeeded\n"));
+		return NT_STATUS_NOPROBLEMO;
+	}
+	report(out_hnd, "FAILED\n");
+	return NT_STATUS_UNSUCCESSFUL;
+}
+
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+uint32 cmd_spoolss_getprinter(struct client_info *info, int argc, char *argv[])
+{
+        PRINTER_INFO_CTR ctr;
+        fstring srv_name;
+        fstring station;
+        char *printer_name;
+        uint32 level;
+
+        if (argc < 2) {
+                report(out_hnd, "spoolgetprinter <printer name>\n");
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        printer_name = argv[1];
+
+        fstrcpy(station, "\\\\");
+        fstrcat(station, info->myhostname);
+        strupper(station);
+
+        fstrcpy(srv_name, "\\\\");
+        fstrcat(srv_name, info->dest_host);
+        strupper(srv_name);
+
+        if (!strnequal("\\\\", printer_name, 2))
+        {
+                fstrcat(srv_name, "\\");
+                fstrcat(srv_name, printer_name);
+                printer_name = srv_name;
+        }
+
+        if (argc < 3)
+                level=2;
+        else
+                level = atoi(argv[2]);
+
+        if (msrpc_spoolss_getprinter(printer_name, level, station, "Administrator", ctr))
+                DEBUG(5,("cmd_spoolss_getprinter: query succeeded\n"));
+        else
+                report(out_hnd, "FAILED\n");
+
+        return NT_STATUS_NOPROBLEMO;
+}
+
+
+static void display_spool_job_info_ctr( const char* printer_name,
+                                const char* station,
+                                uint32 level,
+                                uint32 num, void *const *const ctr)
+{
+        display_job_info_ctr(out_hnd, ACTION_HEADER   , level, num, ctr);
+        display_job_info_ctr(out_hnd, ACTION_ENUMERATE, level, num, ctr);
+        display_job_info_ctr(out_hnd, ACTION_FOOTER   , level, num, ctr);
+}
+
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+uint32 cmd_spoolss_enum_jobs(struct client_info *info, int argc, char *argv[])
+{
+        fstring srv_name;
+        fstring station;
+        char *printer_name;
+
+        void **ctr = NULL;
+        uint32 level = 1;
+
+        if (argc < 1) {
+                report(out_hnd, "spooljobs <printer name>\n");
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        printer_name = argv[1];
+
+        fstrcpy(station, "\\\\");
+        fstrcat(station, info->myhostname);
+        strupper(station);
+
+        fstrcpy(srv_name, "\\\\");
+        fstrcat(srv_name, info->dest_host);
+        strupper(srv_name);
+
+        if (!strnequal("\\\\", printer_name, 2))
+        {
+                fstrcat(srv_name, "\\");
+                fstrcat(srv_name, printer_name);
+                printer_name = srv_name;
+        }
+
+        DEBUG(4,("spoolopen - printer: %s station: %s user: %s\n", printer_name, 
+		  station, usr_creds->ntc.user_name));
+
+        if (msrpc_spoolss_enum_jobs( printer_name, station,
+                                usr_creds->ntc.user_name,
+                                level, &ctr, display_spool_job_info_ctr))
+        {
+                DEBUG(5,("cmd_spoolss_enum_jobs: query succeeded\n"));
+                return NT_STATUS_NOPROBLEMO;
+        }
+        report(out_hnd, "FAILED\n");
+        return NT_STATUS_UNSUCCESSFUL;
+}
+
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+uint32 cmd_spoolss_open_printer_ex(struct client_info *info, int argc, char *argv[])
+{
+        fstring srv_name;
+        fstring station;
+        char *printer_name;
+        POLICY_HND hnd;
+
+        BOOL res = True;
+
+        if (argc < 2)
+        {
+                report(out_hnd, "spoolopen <printer name>\n");
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        printer_name = argv[1];
+
+        fstrcpy(station, "\\\\");
+        fstrcat(station, info->myhostname);
+        strupper(station);
+
+        fstrcpy(srv_name, "\\\\");
+        fstrcat(srv_name, info->dest_host);
+        strupper(srv_name);
+
+        if (!strnequal("\\\\", printer_name, 2))
+        {
+                fstrcat(srv_name, "\\");
+                fstrcat(srv_name, printer_name);
+                printer_name = srv_name;
+        }
+/*
+        DEBUG(4,("spoolopen - printer: %s server: %s user: %s\n",
+                printer_name, station, usr_creds->ntc.user_name));
+*/
+
+        res = res ? spoolss_open_printer_ex( printer_name, "", PRINTER_ALL_ACCESS,
+                                station, "Administrateur", &hnd) : False;
+
+        res = res ? spoolss_closeprinter(&hnd) : False;
+
+        if (res)
+        {
+                DEBUG(5,("cmd_spoolss_open_printer_ex: query succeeded\n"));
+                report(out_hnd, "OK\n");
+                return NT_STATUS_NOPROBLEMO;
+        }
+        DEBUG(5,("cmd_spoolss_open_printer_ex: query failed\n"));
+        return NT_STATUS_UNSUCCESSFUL;
+}
+
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+uint32 cmd_spoolss_getprinterdata(struct client_info *info, int argc, char *argv[])
+{
+        fstring srv_name;
+        fstring station;
+        char *printer_name;
+        char *value_name;
+
+        NEW_BUFFER ctr;
+        uint32 status;
+        uint32 type = 1;
+
+        if (argc < 2) {
+                report(out_hnd, "spoolgetdata <printer name> <value name>\n");
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        printer_name = argv[1];
+        value_name = argv[2];
+
+        fstrcpy(station, "\\\\");
+        fstrcat(station, info->myhostname);
+        strupper(station);
+
+        fstrcpy(srv_name, "\\\\");
+        fstrcat(srv_name, info->dest_host);
+        strupper(srv_name);
+
+        if (!strnequal("\\\\", printer_name, 2))
+        {
+                fstrcat(srv_name, "\\");
+                fstrcat(srv_name, printer_name);
+                printer_name = srv_name;
+        }
+
+        DEBUG(4,("spoolgetdata - printer: %s station: %s value: %s\n",
+                                printer_name, station, value_name));
+
+        status = msrpc_spoolss_getprinterdata( printer_name, station,
+                                "Administrateur",
+                                /*usr_creds->ntc.user_name,*/
+                                value_name, &type,
+                                &ctr, NULL);
+
+        if (status == NT_STATUS_NOPROBLEMO)
+        {
+                DEBUG(5,("cmd_spoolss_getprinterdata: query succeeded\n"));
+        }
+        else
+        {
+                report(out_hnd, "FAILED\n");
+        }
+
+        return status;
+}
+
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+uint32 cmd_spoolss_getprinterdriver(struct client_info *info, int argc, char *argv[])
+{
+        PRINTER_DRIVER_CTR ctr;
+        fstring srv_name;
+        fstring station;
+        char *printer_name;
+        fstring environment;
+        uint32 level;
+
+        if (argc < 1) {
+                report(out_hnd, "spoolgetprinterdriver <printer name>\n");
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        printer_name = argv[1];
+
+        fstrcpy(station, "\\\\");
+        fstrcat(station, info->myhostname);
+        strupper(station);
+
+        fstrcpy(srv_name, "\\\\");
+        fstrcat(srv_name, info->dest_host);
+        strupper(srv_name);
+
+        if (!strnequal("\\\\", printer_name, 2))
+        {
+                fstrcat(srv_name, "\\");
+                fstrcat(srv_name, printer_name);
+                printer_name = srv_name;
+        }
+
+        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");
+
+        return NT_STATUS_NOPROBLEMO;
+}
+
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+uint32 cmd_spoolss_enumprinterdrivers(struct client_info *info, int argc, char *argv[])
+{
+        PRINTER_DRIVER_CTR ctr;
+        fstring srv_name;
+        fstring environment;
+        uint32 level;
+
+        fstrcpy(srv_name, "\\\\");
+        fstrcat(srv_name, info->dest_host);
+        strupper(srv_name);
+
+        fstrcpy(environment, "Windows NT x86");
+        level=3;
+
+        if (msrpc_spoolss_enumprinterdrivers(srv_name, environment, level, ctr))
+                DEBUG(5,("cmd_spoolss_enumprinterdrivers: query succeeded\n"));
+        else
+                report(out_hnd, "FAILED\n");
+
+        return NT_STATUS_NOPROBLEMO;
+}
+
+/****************************************************************************
+nt spoolss query
+****************************************************************************/
+uint32 cmd_spoolss_getprinterdriverdir(struct client_info *info, int argc, char *argv[])
+{
+        DRIVER_DIRECTORY_CTR ctr;
+        int i;
+
+        uint32 level = 1;
+
+        fstring srv_name;
+        fstring env;
+
+        fstrcpy(srv_name, "\\\\");
+        fstrcat(srv_name, info->dest_host);
+        strupper(srv_name);
+
+        if (argc < 1) {
+                report(out_hnd, "spoolgetprinterdriverdir <arch>\n");
+                return NT_STATUS_NOPROBLEMO;
+        }
+
+        fstrcpy(env, argv[1]);
+
+        for (i=2; i<argc; i++) {
+                fstrcat(env, " ");
+                fstrcat(env, argv[i]);
+        }
+
+        if (msrpc_spoolss_getprinterdriverdir(srv_name, env, level, ctr))
+                DEBUG(5,("cmd_spoolss_getprinterdriverdir: query succeeded\n"));
+        else
+                report(out_hnd, "FAILED\n");
+
+        return NT_STATUS_NOPROBLEMO;
+}
+
diff --git a/source3/rpcclient/spoolss_cmds.c b/source3/rpcclient/spoolss_cmds.c
index 251f6e0c2c..1538f560f9 100644
--- a/source3/rpcclient/spoolss_cmds.c
+++ b/source3/rpcclient/spoolss_cmds.c
@@ -35,7 +35,6 @@ static const struct command_set spl_commands[] = {
 	 "Enumerate Printers",
 	 {NULL, NULL}},
 
-#if 0	/* commented out by JERRY */
 	{"spoolenumdatas", cmd_spoolss_enum_printerdata,
 	 "<printer name> Enumerate Printer datas",
 	 {NULL, NULL}},
@@ -63,7 +62,6 @@ static const struct command_set spl_commands[] = {
 	{"spoolgetprinterdriverdir", cmd_spoolss_getprinterdriverdir,
 	 "Spool get printer driver directory",
 	 {NULL, NULL}},
-#endif
 	/*
 	 * oop!
 	 */