*/
#include "includes.h"
-
-extern int DEBUGLEVEL;
-
-extern pstring server;
-extern pstring global_myname;
-extern pstring username, password;
-extern pstring workgroup;
+#include "rpcclient.h"
struct table_node {
char *long_archi;
if (archi_table[i].long_archi==NULL) {
DEBUGADD(10,("Unknown architecture [%s] !\n", long_archi));
- return FALSE;
+ return False;
}
StrnCpy (short_archi, archi_table[i].short_archi, strlen(archi_table[i].short_archi));
/**********************************************************************
* dummy function -- placeholder
*/
-static uint32 cmd_spoolss_not_implemented (struct cli_state *cli,
- int argc, char **argv)
+static NTSTATUS cmd_spoolss_not_implemented(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
printf ("(*) This command is not currently implemented.\n");
- return NT_STATUS_NOPROBLEMO;
-}
-
-/****************************************************************************
- display sec_ace structure
- ****************************************************************************/
-static void display_sec_ace(SEC_ACE *ace)
-{
- fstring sid_str;
-
- sid_to_string(sid_str, &ace->sid);
- printf("\t\tSID: %s\n", sid_str);
-
- printf("\t\ttype:[%d], flags:[0x%02x], mask:[0x%08x]\n",
- ace->type, ace->flags, ace->info.mask);
-}
-
-/****************************************************************************
- display sec_acl structure
- ****************************************************************************/
-static void display_sec_acl(SEC_ACL *acl)
-{
- if (acl->size != 0 && acl->num_aces != 0) {
- int i;
-
- printf("\t\tRevision:[%d]\n", acl->revision);
- for (i = 0; i < acl->num_aces; i++) {
- display_sec_ace(&acl->ace[i]);
- }
- }
-}
-
-/****************************************************************************
- display sec_desc structure
- ****************************************************************************/
-static void display_sec_desc(SEC_DESC *sec)
-{
- fstring sid_str;
-
- printf("\tRevision:[%d]\n", sec->revision);
-
- if (sec->off_owner_sid) {
- sid_to_string(sid_str, sec->owner_sid);
- printf("\tOwner SID: %s\n", sid_str);
- }
-
- if (sec->off_grp_sid) {
- sid_to_string(sid_str, sec->grp_sid);
- printf("\tGroup SID: %s\n", sid_str);
- }
-
- if (sec->off_sacl) display_sec_acl(sec->sacl);
- if (sec->off_dacl) display_sec_acl(sec->dacl);
+ return NT_STATUS_OK;
}
/***********************************************************************
* Get printer information
*/
-static uint32 cmd_spoolss_open_printer_ex(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_open_printer_ex(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
pstring printername;
fstring servername, user;
POLICY_HND hnd;
- TALLOC_CTX *mem_ctx;
if (argc != 2) {
printf("Usage: %s <printername>\n", argv[0]);
- return NT_STATUS_NOPROBLEMO;
+ return NT_STATUS_OK;
}
if (!cli)
return NT_STATUS_UNSUCCESSFUL;
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_open_printer_ex: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
-
slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
strupper (servername);
fstrcpy (user, cli->user_name);
fstrcpy (printername, argv[1]);
-
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
- }
-
/* Open the printer handle */
result = cli_spoolss_open_printer_ex (cli, mem_ctx, printername, "",
MAXIMUM_ALLOWED_ACCESS, servername, user, &hnd);
- if (result == NT_STATUS_NOPROBLEMO) {
+ if (NT_STATUS_IS_OK(result)) {
printf ("Printer %s opened successfully\n", printername);
result = cli_spoolss_close_printer (cli, mem_ctx, &hnd);
- if (result != NT_STATUS_NOPROBLEMO) {
+ if (!NT_STATUS_IS_OK(result)) {
printf ("Error closing printer handle! (%s)\n", get_nt_error_msg(result));
}
}
- cli_nt_session_close(cli);
- talloc_destroy(mem_ctx);
-
return result;
}
fstring name;
fstring comm;
- rpcstr_pull(desc, i1->description.buffer, sizeof(desc), 0, STR_TERMINATE);
- rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE);
- rpcstr_pull(comm, i1->comment.buffer, sizeof(comm), 0, STR_TERMINATE);
+ desc[0] = name[0] = comm[0] = 0;
+
+ if (i1->description.buffer)
+ rpcstr_pull(desc, i1->description.buffer, sizeof(desc), 0,
+ STR_TERMINATE);
+
+ if (i1->name.buffer)
+ rpcstr_pull(name, i1->name.buffer, sizeof(name), 0,
+ STR_TERMINATE);
+
+ if (i1->comment.buffer)
+ rpcstr_pull(comm, i1->comment.buffer, sizeof(comm), 0,
+ STR_TERMINATE);
printf("\tflags:[0x%x]\n", i1->flags);
printf("\tname:[%s]\n", name);
/* Enumerate printers */
-static uint32 cmd_spoolss_enum_printers(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_enum_printers(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
- uint32 result = NT_STATUS_UNSUCCESSFUL,
- info_level = 1;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ uint32 info_level = 1;
PRINTER_INFO_CTR ctr;
int returned;
uint32 i = 0;
- TALLOC_CTX *mem_ctx;
if (argc > 2)
{
printf("Usage: %s [level]\n", argv[0]);
- return NT_STATUS_NOPROBLEMO;
- }
-
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_enum_printers: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_OK;
}
-
if (argc == 2) {
info_level = atoi(argv[1]);
}
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
- }
-
/* Enumerate printers -- Should we enumerate types other
than PRINTER_ENUM_LOCAL? Maybe accept as a parameter? --jerry */
ZERO_STRUCT(ctr);
result = cli_spoolss_enum_printers(cli, mem_ctx, PRINTER_ENUM_LOCAL,
info_level, &returned, &ctr);
- if (result == NT_STATUS_NOPROBLEMO)
+ if (NT_STATUS_IS_OK(result))
{
if (!returned)
printf ("No Printers printers returned.\n");
}
}
- cli_nt_session_close(cli);
- talloc_destroy(mem_ctx);
-
return result;
}
/* Enumerate ports */
-static uint32 cmd_spoolss_enum_ports(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
- uint32 result = NT_STATUS_UNSUCCESSFUL,
- info_level = 1;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ uint32 info_level = 1;
PORT_INFO_CTR ctr;
int returned;
- TALLOC_CTX *mem_ctx;
if (argc > 2) {
printf("Usage: %s [level]\n", argv[0]);
- return NT_STATUS_NOPROBLEMO;
+ return NT_STATUS_OK;
}
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_enum_ports: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
-
if (argc == 2) {
info_level = atoi(argv[1]);
}
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
- }
-
/* Enumerate ports */
ZERO_STRUCT(ctr);
result = cli_spoolss_enum_ports(cli, mem_ctx, info_level, &returned, &ctr);
- if (result == NT_STATUS_NOPROBLEMO) {
+ if (NT_STATUS_IS_OK(result)) {
int i;
for (i = 0; i < returned; i++) {
}
}
- cli_nt_session_close(cli);
- talloc_destroy(mem_ctx);
-
return result;
}
/***********************************************************************
* Get printer information
*/
-static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
POLICY_HND pol;
- uint32 result,
- info_level = 1;
+ NTSTATUS result;
+ uint32 info_level = 1;
BOOL opened_hnd = False;
PRINTER_INFO_CTR ctr;
fstring printername,
servername,
user;
- TALLOC_CTX *mem_ctx;
if (argc == 1 || argc > 3) {
printf("Usage: %s <printername> [level]\n", argv[0]);
- return NT_STATUS_NOPROBLEMO;
- }
-
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_getprinter: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
-
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS)) {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_OK;
}
/* Open a printer handle */
fstrcpy (user, cli->user_name);
/* get a printer handle */
- if ((result = cli_spoolss_open_printer_ex(
+ result = cli_spoolss_open_printer_ex(
cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, servername,
- user, &pol)) != NT_STATUS_NOPROBLEMO) {
+ user, &pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
opened_hnd = True;
/* Get printer info */
- if ((result = cli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr))
- != NT_STATUS_NOPROBLEMO) {
+ result = cli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
if (opened_hnd)
cli_spoolss_close_printer(cli, mem_ctx, &pol);
- cli_nt_session_close(cli);
- talloc_destroy(mem_ctx);
-
return result;
}
/***********************************************************************
* Get printer information
*/
-static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
POLICY_HND pol;
- uint32 result,
- info_level = 3;
+ NTSTATUS result;
+ uint32 info_level = 3;
BOOL opened_hnd = False;
PRINTER_DRIVER_CTR ctr;
fstring printername,
servername,
user;
uint32 i;
- TALLOC_CTX *mem_ctx;
if ((argc == 1) || (argc > 3))
{
printf("Usage: %s <printername> [level]\n", argv[0]);
- return NT_STATUS_NOPROBLEMO;
- }
-
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_getdriver: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS))
- {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_OK;
}
/* get the arguments need to open the printer handle */
info_level = atoi(argv[2]);
/* Open a printer handle */
- if ((result=cli_spoolss_open_printer_ex (cli, mem_ctx, printername, "",
- MAXIMUM_ALLOWED_ACCESS, servername, user, &pol)) != NT_STATUS_NOPROBLEMO)
- {
+ result=cli_spoolss_open_printer_ex (cli, mem_ctx, printername, "",
+ MAXIMUM_ALLOWED_ACCESS, servername, user, &pol);
+ if (!NT_STATUS_IS_OK(result)) {
printf ("Error opening printer handle for %s!\n", printername);
return result;
}
/* loop through and print driver info level for each architecture */
for (i=0; archi_table[i].long_archi!=NULL; i++)
{
- result = cli_spoolss_getprinterdriver (cli, mem_ctx, &pol, info_level,
- archi_table[i].long_archi, &ctr);
-
- switch (result)
- {
- case NT_STATUS_NOPROBLEMO:
- break;
-
- case ERROR_UNKNOWN_PRINTER_DRIVER:
- continue;
-
- default:
- printf ("Error getting driver for %s [%s] - %s\n", printername,
- archi_table[i].long_archi, get_nt_error_msg(result));
+ result = cli_spoolss_getprinterdriver(cli, mem_ctx, &pol, info_level,
+ archi_table[i].long_archi, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
continue;
}
printf("unknown info level %d\n", info_level);
break;
}
-
-
}
-
/* cleanup */
if (opened_hnd)
cli_spoolss_close_printer (cli, mem_ctx, &pol);
- cli_nt_session_close (cli);
- talloc_destroy(mem_ctx);
- if (result==ERROR_UNKNOWN_PRINTER_DRIVER)
- return NT_STATUS_NOPROBLEMO;
- else
- return result;
+ return result;
}
/***********************************************************************
* Get printer information
*/
-static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_enum_drivers(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
- uint32 result=0,
- info_level = 1;
+ NTSTATUS result = NT_STATUS_OK;
+ uint32 info_level = 1;
PRINTER_DRIVER_CTR ctr;
fstring servername;
uint32 i, j,
returned;
- TALLOC_CTX *mem_ctx;
if (argc > 2)
{
printf("Usage: enumdrivers [level]\n");
- return NT_STATUS_NOPROBLEMO;
- }
-
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_enum_drivers: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS))
- {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_OK;
}
/* get the arguments need to open the printer handle */
continue;
- if (result != NT_STATUS_NOPROBLEMO)
+ if (!NT_STATUS_IS_OK(result))
{
printf ("Error getting driver for environment [%s] - %s\n",
archi_table[i].long_archi, get_nt_error_msg(result));
}
}
-
- /* cleanup */
- cli_nt_session_close (cli);
- talloc_destroy(mem_ctx);
-
- if (result==ERROR_UNKNOWN_PRINTER_DRIVER)
- return NT_STATUS_NOPROBLEMO;
- else
- return result;
-
+ return result;
}
/****************************************************************************
/***********************************************************************
* Get printer driver directory information
*/
-static uint32 cmd_spoolss_getdriverdir(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_getdriverdir(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
- uint32 result;
+ NTSTATUS result;
fstring env;
DRIVER_DIRECTORY_CTR ctr;
- TALLOC_CTX *mem_ctx;
if (argc > 2)
{
printf("Usage: %s [environment]\n", argv[0]);
- return NT_STATUS_NOPROBLEMO;
- }
-
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS))
- {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_getdriverdir: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_OK;
}
-
/* get the arguments need to open the printer handle */
if (argc == 2)
fstrcpy (env, argv[1]);
fstrcpy (env, "Windows NT x86");
/* Get the directory. Only use Info level 1 */
- if ((result = cli_spoolss_getprinterdriverdir (cli, mem_ctx, 1, env, &ctr))
- != NT_STATUS_NOPROBLEMO)
- {
+ result = cli_spoolss_getprinterdriverdir (cli, mem_ctx, 1, env, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
return result;
}
display_printdriverdir_1 (ctr.info1);
- /* cleanup */
- cli_nt_session_close (cli);
- talloc_destroy(mem_ctx);
-
return result;
-
}
/*******************************************************************************
}
for (i=0; i<len; i++)
{
- info->dependentfiles[i] = (uint16)str2[i];
+ info->dependentfiles[i] = SSVAL(&info->dependentfiles[i], 0, str2[i]);
}
info->dependentfiles[len] = '\0';
}
-static uint32 cmd_spoolss_addprinterdriver (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_addprinterdriver(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
- uint32 result,
- level = 3;
+ NTSTATUS result;
+ uint32 level = 3;
PRINTER_DRIVER_CTR ctr;
DRIVER_INFO_3 info3;
fstring arch;
fstring driver_name;
- TALLOC_CTX *mem_ctx = NULL;
/* parse the command arguements */
if (argc != 3)
printf ("\t<Config File Name>:<Help File Name>:<Language Monitor Name>:\\\n");
printf ("\t<Default Data Type>:<Comma Separated list of Files>\n");
- return NT_STATUS_NOPROBLEMO;
+ return NT_STATUS_OK;
}
-
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_addprinterdriver: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS))
- {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
- }
-
/* Fill in the DRIVER_INFO_3 struct */
ZERO_STRUCT(info3);
ctr.info3 = &info3;
- if ((result = cli_spoolss_addprinterdriver (cli, mem_ctx, level, &ctr))
- != NT_STATUS_NOPROBLEMO)
- {
+ result = cli_spoolss_addprinterdriver (cli, mem_ctx, level, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
return result;
}
rpcstr_pull(driver_name, info3.name.buffer, sizeof(driver_name), 0, STR_TERMINATE);
printf ("Printer Driver %s successfully installed.\n", driver_name);
- /* cleanup */
- cli_nt_session_close (cli);
- talloc_destroy(mem_ctx);
-
return result;
-
}
-static uint32 cmd_spoolss_addprinterex (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_addprinterex(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
- uint32 result,
- level = 2;
+ NTSTATUS result;
+ uint32 level = 2;
PRINTER_INFO_CTR ctr;
PRINTER_INFO_2 info2;
fstring servername;
- TALLOC_CTX *mem_ctx = NULL;
/* parse the command arguements */
if (argc != 5)
{
printf ("Usage: %s <name> <shared name> <driver> <port>\n", argv[0]);
- return NT_STATUS_NOPROBLEMO;
+ return NT_STATUS_OK;
}
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_addprinterex: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
-
slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
strupper (servername);
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS))
- {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
- }
-
-
/* Fill in the DRIVER_INFO_3 struct */
ZERO_STRUCT(info2);
#if 0 /* JERRY */
*/
ctr.printers_2 = &info2;
- if ((result = cli_spoolss_addprinterex (cli, mem_ctx, level, &ctr))
- != NT_STATUS_NOPROBLEMO)
- {
- cli_nt_session_close (cli);
+ result = cli_spoolss_addprinterex (cli, mem_ctx, level, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
return result;
}
printf ("Printer %s successfully installed.\n", argv[1]);
- /* cleanup */
- cli_nt_session_close (cli);
- talloc_destroy(mem_ctx);
-
return result;
-
}
-static uint32 cmd_spoolss_setdriver (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_setdriver(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
POLICY_HND pol;
- uint32 result,
- level = 2;
+ NTSTATUS result;
+ uint32 level = 2;
BOOL opened_hnd = False;
PRINTER_INFO_CTR ctr;
PRINTER_INFO_2 info2;
fstring servername,
printername,
user;
- TALLOC_CTX *mem_ctx = NULL;
/* parse the command arguements */
if (argc != 3)
{
printf ("Usage: %s <printer> <driver>\n", argv[0]);
- return NT_STATUS_NOPROBLEMO;
+ return NT_STATUS_OK;
}
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_setdriver: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
strupper (servername);
slprintf (printername, sizeof(fstring)-1, "%s\\%s", servername, argv[1]);
fstrcpy (user, cli->user_name);
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS))
- {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
- }
-
-
/* get a printer handle */
- if ((result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "",
- MAXIMUM_ALLOWED_ACCESS, servername, user, &pol))
- != NT_STATUS_NOPROBLEMO)
- {
+ result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "",
+ MAXIMUM_ALLOWED_ACCESS, servername, user, &pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Get printer info */
ZERO_STRUCT (info2);
ctr.printers_2 = &info2;
- if ((result = cli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr)) != NT_STATUS_NOPROBLEMO)
- {
+ result = cli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
printf ("Unable to retrieve printer information!\n");
goto done;
}
/* set the printer driver */
init_unistr(&ctr.printers_2->drivername, argv[2]);
- if ((result = cli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0)) != NT_STATUS_NOPROBLEMO)
- {
+ result = cli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0);
+ if (!NT_STATUS_IS_OK(result)) {
printf ("SetPrinter call failed!\n");
goto done;;
}
/* cleanup */
if (opened_hnd)
cli_spoolss_close_printer(cli, mem_ctx, &pol);
- cli_nt_session_close (cli);
- talloc_destroy(mem_ctx);
return result;
}
-static uint32 cmd_spoolss_deletedriver (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_deletedriver(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
{
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
fstring servername;
- TALLOC_CTX *mem_ctx = NULL;
int i;
/* parse the command arguements */
if (argc != 2)
{
printf ("Usage: %s <driver>\n", argv[0]);
- return NT_STATUS_NOPROBLEMO;
+ return NT_STATUS_OK;
}
- if (!(mem_ctx=talloc_init()))
- {
- DEBUG(0,("cmd_spoolss_deletedriver: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
strupper (servername);
- /* Initialise RPC connection */
- if (!cli_nt_session_open (cli, PIPE_SPOOLSS))
- {
- fprintf (stderr, "Could not initialize spoolss pipe!\n");
- return NT_STATUS_UNSUCCESSFUL;
- }
-
/* delete the driver for all architectures */
for (i=0; archi_table[i].long_archi; i++)
{
/* make the call to remove the driver */
- if ((result = cli_spoolss_deleteprinterdriver(cli, mem_ctx,
- archi_table[i].long_archi, argv[1])) != NT_STATUS_NOPROBLEMO)
- {
+ result = cli_spoolss_deleteprinterdriver(cli, mem_ctx,
+ archi_table[i].long_archi, argv[1]);
+ if (!NT_STATUS_IS_OK(result)) {
printf ("Failed to remove driver %s for arch [%s] - error %s!\n",
argv[1], archi_table[i].long_archi, get_nt_error_msg(result));
}
printf ("Driver %s removed for arch [%s].\n", argv[1], archi_table[i].long_archi);
}
+ return NT_STATUS_OK;
+}
- /* cleanup */
- cli_nt_session_close (cli);
- talloc_destroy(mem_ctx);
+static NTSTATUS cmd_spoolss_getprintprocdir(struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, char **argv)
+{
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ char *servername = NULL, *environment = NULL;
+ fstring procdir;
- return NT_STATUS_NOPROBLEMO;
-}
+ /* parse the command arguements */
+ if (argc < 2 || argc > 3) {
+ printf ("Usage: %s <server> [environment]\n", argv[0]);
+ return NT_STATUS_OK;
+ }
+
+ asprintf(&servername, "\\\\%s", cli->desthost);
+ strupper(servername);
+
+ asprintf(&environment, "%s", (argc == 3) ? argv[2] :
+ PRINTER_DRIVER_ARCHITECTURE);
+ result = cli_spoolss_getprintprocessordirectory(
+ cli, mem_ctx, servername, environment, procdir);
+
+ if (NT_STATUS_IS_OK(result))
+ printf("%s", procdir);
+
+ SAFE_FREE(servername);
+ SAFE_FREE(environment);
+
+ return result;
+}
/* List of commands exported by this module */
struct cmd_set spoolss_commands[] = {
{ "SPOOLSS" },
- { "adddriver", cmd_spoolss_addprinterdriver, "Add a print driver", "" },
- { "addprinter", cmd_spoolss_addprinterex, "Add a printer", "" },
- { "deldriver", cmd_spoolss_deletedriver, "Delete a printer driver", "" },
- { "enumdata", cmd_spoolss_not_implemented, "Enumerate printer data (*)", "" },
- { "enumjobs", cmd_spoolss_not_implemented, "Enumerate print jobs (*)", "" },
- { "enumports", cmd_spoolss_enum_ports, "Enumerate printer ports", "" },
- { "enumdrivers", cmd_spoolss_enum_drivers, "Enumerate installed printer drivers", "" },
- { "enumprinters", cmd_spoolss_enum_printers, "Enumerate printers", "" },
- { "getdata", cmd_spoolss_not_implemented, "Get print driver data (*)", "" },
- { "getdriver", cmd_spoolss_getdriver, "Get print driver information", "" },
- { "getdriverdir", cmd_spoolss_getdriverdir, "Get print driver upload directory", "" },
- { "getprinter", cmd_spoolss_getprinter, "Get printer info", "" },
- { "openprinter", cmd_spoolss_open_printer_ex, "Open printer handle", "" },
- { "setdriver", cmd_spoolss_setdriver, "Set printer driver", "" },
+ { "adddriver", cmd_spoolss_addprinterdriver, PIPE_SPOOLSS, "Add a print driver", "" },
+ { "addprinter", cmd_spoolss_addprinterex, PIPE_SPOOLSS, "Add a printer", "" },
+ { "deldriver", cmd_spoolss_deletedriver, PIPE_SPOOLSS, "Delete a printer driver", "" },
+ { "enumdata", cmd_spoolss_not_implemented, PIPE_SPOOLSS, "Enumerate printer data (*)", "" },
+ { "enumjobs", cmd_spoolss_not_implemented, PIPE_SPOOLSS, "Enumerate print jobs (*)", "" },
+ { "enumports", cmd_spoolss_enum_ports, PIPE_SPOOLSS, "Enumerate printer ports", "" },
+ { "enumdrivers", cmd_spoolss_enum_drivers, PIPE_SPOOLSS, "Enumerate installed printer drivers", "" },
+ { "enumprinters", cmd_spoolss_enum_printers, PIPE_SPOOLSS, "Enumerate printers", "" },
+ { "getdata", cmd_spoolss_not_implemented, PIPE_SPOOLSS, "Get print driver data (*)", "" },
+ { "getdriver", cmd_spoolss_getdriver, PIPE_SPOOLSS, "Get print driver information", "" },
+ { "getdriverdir", cmd_spoolss_getdriverdir, PIPE_SPOOLSS, "Get print driver upload directory", "" },
+ { "getprinter", cmd_spoolss_getprinter, PIPE_SPOOLSS, "Get printer info", "" },
+ { "openprinter", cmd_spoolss_open_printer_ex, PIPE_SPOOLSS, "Open printer handle", "" },
+ { "setdriver", cmd_spoolss_setdriver, PIPE_SPOOLSS, "Set printer driver", "" },
+ { "getprintprocdir", cmd_spoolss_getprintprocdir, PIPE_SPOOLSS, "Get print processor directory", "" },
{ NULL }
};
git.samba.org / ira / wip.git / blobdiff