From b031af348c7dcc8c74bf49945211c466b8eca079 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 27 Aug 2001 19:46:22 +0000 Subject: converted another bunch of stuff to NTSTATUS (This used to be commit 1d36250e338ae0ff9fbbf86019809205dd97d05e) --- source3/rpcclient/cmd_spoolss.c | 62 ++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'source3/rpcclient/cmd_spoolss.c') diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 70552c9c72..836c048444 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -84,7 +84,7 @@ static uint32 cmd_spoolss_not_implemented (struct cli_state *cli, int argc, char **argv) { printf ("(*) This command is not currently implemented.\n"); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } /**************************************************************************** @@ -152,7 +152,7 @@ static uint32 cmd_spoolss_open_printer_ex(struct cli_state *cli, int argc, char if (argc != 2) { printf("Usage: %s \n", argv[0]); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } if (!cli) @@ -182,10 +182,10 @@ static uint32 cmd_spoolss_open_printer_ex(struct cli_state *cli, int argc, char result = cli_spoolss_open_printer_ex (cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, servername, user, &hnd); - if (result == NT_STATUS_NOPROBLEMO) { + if (result == NT_STATUS_OK) { printf ("Printer %s opened successfully\n", printername); result = cli_spoolss_close_printer (cli, mem_ctx, &hnd); - if (result != NT_STATUS_NOPROBLEMO) { + if (result != NT_STATUS_OK) { printf ("Error closing printer handle! (%s)\n", get_nt_error_msg(result)); } } @@ -344,7 +344,7 @@ static uint32 cmd_spoolss_enum_printers(struct cli_state *cli, int argc, char ** if (argc > 2) { printf("Usage: %s [level]\n", argv[0]); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } if (!(mem_ctx=talloc_init())) @@ -371,7 +371,7 @@ static uint32 cmd_spoolss_enum_printers(struct cli_state *cli, int argc, char ** result = cli_spoolss_enum_printers(cli, mem_ctx, PRINTER_ENUM_LOCAL, info_level, &returned, &ctr); - if (result == NT_STATUS_NOPROBLEMO) + if (result == NT_STATUS_OK) { if (!returned) printf ("No Printers printers returned.\n"); @@ -452,7 +452,7 @@ static uint32 cmd_spoolss_enum_ports(struct cli_state *cli, int argc, char **arg if (argc > 2) { printf("Usage: %s [level]\n", argv[0]); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } if (!(mem_ctx=talloc_init())) @@ -478,7 +478,7 @@ static uint32 cmd_spoolss_enum_ports(struct cli_state *cli, int argc, char **arg result = cli_spoolss_enum_ports(cli, mem_ctx, info_level, &returned, &ctr); - if (result == NT_STATUS_NOPROBLEMO) { + if (result == NT_STATUS_OK) { int i; for (i = 0; i < returned; i++) { @@ -519,7 +519,7 @@ static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **arg if (argc == 1 || argc > 3) { printf("Usage: %s [level]\n", argv[0]); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } if (!(mem_ctx=talloc_init())) @@ -549,7 +549,7 @@ static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **arg /* get a printer handle */ if ((result = cli_spoolss_open_printer_ex( cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, servername, - user, &pol)) != NT_STATUS_NOPROBLEMO) { + user, &pol)) != NT_STATUS_OK) { goto done; } @@ -557,7 +557,7 @@ static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **arg /* Get printer info */ if ((result = cli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr)) - != NT_STATUS_NOPROBLEMO) { + != NT_STATUS_OK) { goto done; } @@ -720,7 +720,7 @@ static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv if ((argc == 1) || (argc > 3)) { printf("Usage: %s [level]\n", argv[0]); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } if (!(mem_ctx=talloc_init())) @@ -747,7 +747,7 @@ static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv /* Open a printer handle */ if ((result=cli_spoolss_open_printer_ex (cli, mem_ctx, printername, "", - MAXIMUM_ALLOWED_ACCESS, servername, user, &pol)) != NT_STATUS_NOPROBLEMO) + MAXIMUM_ALLOWED_ACCESS, servername, user, &pol)) != NT_STATUS_OK) { printf ("Error opening printer handle for %s!\n", printername); return result; @@ -763,7 +763,7 @@ static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv switch (result) { - case ERRsuccess: + case NT_STATUS_OK: break; case ERRunknownprinterdriver: @@ -805,7 +805,7 @@ static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv talloc_destroy(mem_ctx); if (result==ERRunknownprinterdriver) - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; else return result; @@ -827,7 +827,7 @@ static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **a if (argc > 2) { printf("Usage: enumdrivers [level]\n"); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } if (!(mem_ctx=talloc_init())) @@ -862,7 +862,7 @@ static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **a continue; - if (result != NT_STATUS_NOPROBLEMO) + if (result != NT_STATUS_OK) { printf ("Error getting driver for environment [%s] - %s\n", archi_table[i].long_archi, get_nt_error_msg(result)); @@ -900,7 +900,7 @@ static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **a talloc_destroy(mem_ctx); if (result==ERRunknownprinterdriver) - return ERRsuccess; + return NT_STATUS_OK; else return result; @@ -933,7 +933,7 @@ static uint32 cmd_spoolss_getdriverdir(struct cli_state *cli, int argc, char **a if (argc > 2) { printf("Usage: %s [environment]\n", argv[0]); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } /* Initialise RPC connection */ @@ -958,7 +958,7 @@ static uint32 cmd_spoolss_getdriverdir(struct cli_state *cli, int argc, char **a /* Get the directory. Only use Info level 1 */ if ((result = cli_spoolss_getprinterdriverdir (cli, mem_ctx, 1, env, &ctr)) - != NT_STATUS_NOPROBLEMO) + != NT_STATUS_OK) { return result; } @@ -1100,7 +1100,7 @@ static uint32 cmd_spoolss_addprinterdriver (struct cli_state *cli, int argc, cha printf ("\t:::\\\n"); printf ("\t:\n"); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } if (!(mem_ctx=talloc_init())) @@ -1137,7 +1137,7 @@ static uint32 cmd_spoolss_addprinterdriver (struct cli_state *cli, int argc, cha ctr.info3 = &info3; if ((result = cli_spoolss_addprinterdriver (cli, mem_ctx, level, &ctr)) - != NT_STATUS_NOPROBLEMO) + != NT_STATUS_OK) { return result; } @@ -1167,7 +1167,7 @@ static uint32 cmd_spoolss_addprinterex (struct cli_state *cli, int argc, char ** if (argc != 5) { printf ("Usage: %s \n", argv[0]); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } if (!(mem_ctx=talloc_init())) @@ -1219,7 +1219,7 @@ static uint32 cmd_spoolss_addprinterex (struct cli_state *cli, int argc, char ** ctr.printers_2 = &info2; if ((result = cli_spoolss_addprinterex (cli, mem_ctx, level, &ctr)) - != NT_STATUS_NOPROBLEMO) + != NT_STATUS_OK) { cli_nt_session_close (cli); return result; @@ -1252,7 +1252,7 @@ static uint32 cmd_spoolss_setdriver (struct cli_state *cli, int argc, char **arg if (argc != 3) { printf ("Usage: %s \n", argv[0]); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } if (!(mem_ctx=talloc_init())) @@ -1278,7 +1278,7 @@ static uint32 cmd_spoolss_setdriver (struct cli_state *cli, int argc, char **arg /* get a printer handle */ if ((result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, servername, user, &pol)) - != NT_STATUS_NOPROBLEMO) + != NT_STATUS_OK) { goto done; } @@ -1288,7 +1288,7 @@ static uint32 cmd_spoolss_setdriver (struct cli_state *cli, int argc, char **arg /* Get printer info */ ZERO_STRUCT (info2); ctr.printers_2 = &info2; - if ((result = cli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr)) != NT_STATUS_NOPROBLEMO) + if ((result = cli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr)) != NT_STATUS_OK) { printf ("Unable to retrieve printer information!\n"); goto done; @@ -1296,7 +1296,7 @@ static uint32 cmd_spoolss_setdriver (struct cli_state *cli, int argc, char **arg /* 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) + if ((result = cli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0)) != NT_STATUS_OK) { printf ("SetPrinter call failed!\n"); goto done;; @@ -1326,7 +1326,7 @@ static uint32 cmd_spoolss_deletedriver (struct cli_state *cli, int argc, char ** if (argc != 2) { printf ("Usage: %s \n", argv[0]); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } if (!(mem_ctx=talloc_init())) @@ -1351,7 +1351,7 @@ static uint32 cmd_spoolss_deletedriver (struct cli_state *cli, int argc, char ** { /* 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) + archi_table[i].long_archi, argv[1])) != NT_STATUS_OK) { printf ("Failed to remove driver %s for arch [%s] - error %s!\n", argv[1], archi_table[i].long_archi, get_nt_error_msg(result)); @@ -1365,7 +1365,7 @@ static uint32 cmd_spoolss_deletedriver (struct cli_state *cli, int argc, char ** cli_nt_session_close (cli); talloc_destroy(mem_ctx); - return NT_STATUS_NOPROBLEMO; + return NT_STATUS_OK; } -- cgit