From 648528196ca136469d82b83cd2ba89b1b30290ae Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 25 Jul 2001 06:42:05 +0000 Subject: Held a shoot-out between NT_STATUS_NO_PROBLEMO and NT_STATUS_NOPROBLEMO. According to the incorruptible judges find and grep, the latter won. Mmm - procrastination. (-: (This used to be commit 2e339403605177b15d5185a8fdd1b06f3f043168) --- source3/include/nterr.h | 1 - source3/printing/nt_printing.c | 8 +-- source3/rpc_client/cli_spoolss.c | 20 +++--- source3/rpc_client/msrpc_spoolss.c | 22 +++---- source3/rpc_parse/parse_samr.c | 24 +++---- source3/rpc_server/srv_lsa_nt.c | 20 +++--- source3/rpc_server/srv_samr_nt.c | 60 +++++++++--------- source3/rpc_server/srv_spoolss.c | 2 +- source3/rpc_server/srv_spoolss_nt.c | 122 ++++++++++++++++++------------------ source3/rpcclient/cmd_spoolss.c | 24 +++---- source3/utils/smbpasswd.c | 4 +- 11 files changed, 153 insertions(+), 154 deletions(-) diff --git a/source3/include/nterr.h b/source3/include/nterr.h index 07e874dce0..e7d218a5e8 100644 --- a/source3/include/nterr.h +++ b/source3/include/nterr.h @@ -13,7 +13,6 @@ using a loop in smbclient then printing a netmon sniff to a file */ #define NT_STATUS_NOPROBLEMO (0x0) -#define NT_STATUS_NO_PROBLEMO (0x0) #define NT_STATUS_UNSUCCESSFUL (0xC0000000 | 1) #define NT_STATUS_NOT_IMPLEMENTED (0xC0000000 | 2) #define NT_STATUS_INVALID_INFO_CLASS (0xC0000000 | 3) diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 108186e2dc..10da46501a 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -791,7 +791,7 @@ static uint32 clean_up_driver_struct_level_3(NT_PRINTER_DRIVER_INFO_LEVEL_3 *dri driver->driverpath, user, &err)) == -1) return err; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -856,7 +856,7 @@ static uint32 clean_up_driver_struct_level_6(NT_PRINTER_DRIVER_INFO_LEVEL_6 *dri driver->driverpath, user, &err)) == -1) return err; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -3005,7 +3005,7 @@ uint32 delete_printer_driver (NT_PRINTER_DRIVER_INFO_LEVEL_3 *i) DEBUG(5,("delete_printer_driver: [%s] driver delete successful.\n", i->name)); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** ****************************************************************************/ @@ -3559,7 +3559,7 @@ uint32 printer_write_default_dev(int snum, const PRINTER_DEFAULT *printer_defaul DEBUG(5,("printer_write_default_dev: Access denied for printer %s\n", lp_servicename(snum) )); result = ERROR_ACCESS_DENIED; - /*result = NT_STATUS_NO_PROBLEMO;*/ + /*result = NT_STATUS_NOPROBLEMO;*/ goto done; } diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c index c5b36fe2a5..a06f3afb6a 100644 --- a/source3/rpc_client/cli_spoolss.c +++ b/source3/rpc_client/cli_spoolss.c @@ -126,7 +126,7 @@ uint32 spoolss_enum_printers(uint32 flags, fstring srv_name, uint32 level, if(new_spoolss_io_r_enumprinters("", &r_o, &rbuf, 0)) { - if (r_o.status != NT_STATUS_NO_PROBLEMO) + if (r_o.status != NT_STATUS_NOPROBLEMO) { /* report error code */ DEBUG(3,("SPOOLSS_ENUMPRINTERS: %s\n", get_nt_error_msg(r_o.status))); @@ -186,7 +186,7 @@ uint32 spoolss_enum_ports(fstring srv_name, uint32 level, if(new_spoolss_io_r_enumports("", &r_o, &rbuf, 0)) { - if (r_o.status != NT_STATUS_NO_PROBLEMO) + if (r_o.status != NT_STATUS_NOPROBLEMO) { DEBUG(3,("SPOOLSS_ENUMPORTS: %s\n", get_nt_error_msg(r_o.status))); } @@ -240,7 +240,7 @@ uint32 spoolss_enum_jobs(const POLICY_HND *hnd, uint32 firstjob, uint32 numofjob if(spoolss_io_r_enumjobs("", &r_o, &rbuf, 0)) { - if (r_o.status != NT_STATUS_NO_PROBLEMO) + if (r_o.status != NT_STATUS_NOPROBLEMO) { DEBUG(3,("SPOOLSS_ENUMJOBS: %s\n", get_nt_error_msg(r_o.status))); } @@ -298,7 +298,7 @@ uint32 spoolss_enum_printerdata(const POLICY_HND *hnd, uint32 idx, if(spoolss_io_r_enumprinterdata("", &r_o, &rbuf, 0)) { - if (r_o.status != NT_STATUS_NO_PROBLEMO) + if (r_o.status != NT_STATUS_NOPROBLEMO) { DEBUG(3,("SPOOLSS_ENUMPRINTERDATA: %s\n", get_nt_error_msg(r_o.status))); } @@ -358,7 +358,7 @@ uint32 spoolss_getprinter(const POLICY_HND *hnd, uint32 level, if(!spoolss_io_r_getprinter("", &r_o, &rbuf, 0)) { - if (r_o.status != NT_STATUS_NO_PROBLEMO) + if (r_o.status != NT_STATUS_NOPROBLEMO) { DEBUG(3,("SPOOLSS_GETPRINTER: %s\n", get_nt_error_msg(r_o.status))); } @@ -411,7 +411,7 @@ uint32 spoolss_getprinterdriver(const POLICY_HND *hnd, if(spoolss_io_r_getprinterdriver2("", &r_o, &rbuf, 0)) { - if (r_o.status != NT_STATUS_NO_PROBLEMO) + if (r_o.status != NT_STATUS_NOPROBLEMO) { DEBUG(3,("SPOOLSS_GETPRINTERDRIVER2: %s\n", get_nt_error_msg(r_o.status))); } @@ -561,7 +561,7 @@ BOOL spoolss_addprinterex(POLICY_HND *hnd, const char* srv_name, PRINTER_INFO_2 if(spoolss_io_r_addprinterex("", &r_o, &rbuf, 0)) { - if (r_o.status != NT_STATUS_NO_PROBLEMO) + if (r_o.status != NT_STATUS_NOPROBLEMO) { /* report error code */ DEBUG(3,("SPOOLSS_ADDPRINTEREX: %s\n", get_nt_error_msg(r_o.status))); @@ -690,7 +690,7 @@ uint32 spoolss_getprinterdata(const POLICY_HND *hnd, const UNISTR2 *valuename, if(spoolss_io_r_getprinterdata("", &r_o, &rbuf, 0)) { - if (r_o.status != NT_STATUS_NO_PROBLEMO) + if (r_o.status != NT_STATUS_NOPROBLEMO) { DEBUG(3,("SPOOLSS_GETPRINTERDATA: %s\n", get_nt_error_msg(r_o.status))); } @@ -749,7 +749,7 @@ uint32 spoolss_getprinterdriverdir(fstring srv_name, fstring env_name, uint32 le if(spoolss_io_r_getprinterdriverdir("", &r_o, &rbuf, 0)) { - if (r_o.status != NT_STATUS_NO_PROBLEMO) + if (r_o.status != NT_STATUS_NOPROBLEMO) { DEBUG(3,("SPOOLSS_GETPRINTERDRIVERDIRECTORY: %s\n", get_nt_error_msg(r_o.status))); } @@ -800,7 +800,7 @@ uint32 spoolss_addprinterdriver(const char *srv_name, uint32 level, PRINTER_DRIV if(spoolss_io_r_addprinterdriver("", &r_o, &rbuf, 0)) { - if (r_o.status != NT_STATUS_NO_PROBLEMO) + if (r_o.status != NT_STATUS_NOPROBLEMO) { /* report error code */ DEBUG(3,("SPOOLSS_ADDPRINTERDRIVER: %s\n", get_nt_error_msg(r_o.status))); diff --git a/source3/rpc_client/msrpc_spoolss.c b/source3/rpc_client/msrpc_spoolss.c index 4938178352..4c0d3f4999 100644 --- a/source3/rpc_client/msrpc_spoolss.c +++ b/source3/rpc_client/msrpc_spoolss.c @@ -250,7 +250,7 @@ BOOL msrpc_spoolss_enum_printers(char* srv_name, uint32 flags, needed, &needed, &returned); } - if (status!=NT_STATUS_NO_PROBLEMO) + if (status!=NT_STATUS_NOPROBLEMO) { DEBUG(0,("spoolss_enum_printers: %s\n", get_nt_error_msg(status))); if (mem_ctx) @@ -316,7 +316,7 @@ BOOL msrpc_spoolss_enum_ports(char* srv_name, report(out_hnd, "\tstatus:[%d (%x)]\n", status, status); - if (status!=NT_STATUS_NO_PROBLEMO) + if (status!=NT_STATUS_NOPROBLEMO) { if (mem_ctx) talloc_destroy(mem_ctx); @@ -405,7 +405,7 @@ uint32 msrpc_spoolss_getprinterdata( const char* printer_name, if (mem_ctx) talloc_destroy(mem_ctx); - if (status != NT_STATUS_NO_PROBLEMO) + if (status != NT_STATUS_NOPROBLEMO) { if (!spoolss_closeprinter(&hnd)) return NT_STATUS_ACCESS_DENIED; @@ -462,7 +462,7 @@ BOOL msrpc_spoolss_enum_jobs( const char* printer_name, if (mem_ctx) talloc_destroy(mem_ctx); - if (status!=NT_STATUS_NO_PROBLEMO) { + if (status!=NT_STATUS_NOPROBLEMO) { if (!spoolss_closeprinter(&hnd)) return False; return False; @@ -540,7 +540,7 @@ BOOL msrpc_spoolss_enum_printerdata( const char* printer_name, value, rvaluelen, type, datalen, data, rdatalen); - if (status!=NT_STATUS_NO_PROBLEMO) { + if (status!=NT_STATUS_NOPROBLEMO) { /* * the check on this if statement is redundant * since is the status is bad we're going to @@ -589,7 +589,7 @@ BOOL msrpc_spoolss_getprinter( const char* printer_name, const uint32 level, report(out_hnd, "\tstatus:[%d (%x)]\n", status, status); - if (status!=NT_STATUS_NO_PROBLEMO) + if (status!=NT_STATUS_NOPROBLEMO) { if (mem_ctx) talloc_destroy(mem_ctx); @@ -618,7 +618,7 @@ BOOL msrpc_spoolss_getprinter( const char* printer_name, const uint32 level, if (mem_ctx) talloc_destroy(mem_ctx); - if (status!=NT_STATUS_NO_PROBLEMO) { + if (status!=NT_STATUS_NOPROBLEMO) { if (!spoolss_closeprinter(&hnd)) return False; return False; @@ -662,7 +662,7 @@ BOOL msrpc_spoolss_getprinterdriver( const char* printer_name, /* report(out_hnd, "\tstatus:[%d (%x)]\n", status, status); */ - if (status!=NT_STATUS_NO_PROBLEMO) + if (status!=NT_STATUS_NOPROBLEMO) { if (mem_ctx) talloc_destroy(mem_ctx); @@ -688,7 +688,7 @@ BOOL msrpc_spoolss_getprinterdriver( const char* printer_name, if (mem_ctx) talloc_destroy(mem_ctx); - if (status!=NT_STATUS_NO_PROBLEMO) { + if (status!=NT_STATUS_NOPROBLEMO) { if (!spoolss_closeprinter(&hnd)) return False; return False; @@ -731,7 +731,7 @@ BOOL msrpc_spoolss_enumprinterdrivers( const char* srv_name, report(out_hnd, "\tstatus:[%d (%x)]\n", status, status); - if (status!=NT_STATUS_NO_PROBLEMO) + if (status!=NT_STATUS_NOPROBLEMO) { if (mem_ctx) talloc_destroy(mem_ctx); @@ -788,7 +788,7 @@ BOOL msrpc_spoolss_getprinterdriverdir(char* srv_name, char* env_name, uint32 le report(out_hnd, "\tstatus:[%d (%x)]\n", status, status); - if (status!=NT_STATUS_NO_PROBLEMO) + if (status!=NT_STATUS_NOPROBLEMO) { if (mem_ctx) talloc_destroy(mem_ctx); diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index 76ec35e9c7..7b86b15e87 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -1442,7 +1442,7 @@ uint32 init_sam_dispinfo_1(TALLOC_CTX *ctx, SAM_DISPINFO_1 *sam, uint32 *num_ent max_entries, max_data_size)); if (max_entries==0) - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; sam->sam=(SAM_ENTRY1 *)talloc(ctx, max_entries*sizeof(SAM_ENTRY1)); if (!sam->sam) @@ -1480,7 +1480,7 @@ uint32 init_sam_dispinfo_1(TALLOC_CTX *ctx, SAM_DISPINFO_1 *sam, uint32 *num_ent *num_entries = i; *data_size = dsize; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -1553,7 +1553,7 @@ uint32 init_sam_dispinfo_2(TALLOC_CTX *ctx, SAM_DISPINFO_2 *sam, uint32 *num_ent max_data_size = *data_size; if (max_entries==0) - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; if (!(sam->sam=(SAM_ENTRY2 *)talloc(ctx, max_entries*sizeof(SAM_ENTRY2)))) return NT_STATUS_NO_MEMORY; @@ -1585,7 +1585,7 @@ uint32 init_sam_dispinfo_2(TALLOC_CTX *ctx, SAM_DISPINFO_2 *sam, uint32 *num_ent *num_entries = i; *data_size = dsize; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -1660,7 +1660,7 @@ uint32 init_sam_dispinfo_3(TALLOC_CTX *ctx, SAM_DISPINFO_3 *sam, uint32 *num_ent max_data_size = *data_size; if (max_entries==0) - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; if (!(sam->sam=(SAM_ENTRY3 *)talloc(ctx, max_entries*sizeof(SAM_ENTRY3)))) return NT_STATUS_NO_MEMORY; @@ -1688,7 +1688,7 @@ uint32 init_sam_dispinfo_3(TALLOC_CTX *ctx, SAM_DISPINFO_3 *sam, uint32 *num_ent *num_entries = i; *data_size = dsize; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -1764,7 +1764,7 @@ uint32 init_sam_dispinfo_4(TALLOC_CTX *ctx, SAM_DISPINFO_4 *sam, uint32 *num_ent max_data_size = *data_size; if (max_entries==0) - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; if (!(sam->sam=(SAM_ENTRY4 *)talloc(ctx, max_entries*sizeof(SAM_ENTRY4)))) return NT_STATUS_NO_MEMORY; @@ -1790,7 +1790,7 @@ uint32 init_sam_dispinfo_4(TALLOC_CTX *ctx, SAM_DISPINFO_4 *sam, uint32 *num_ent *num_entries = i; *data_size = dsize; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -1866,7 +1866,7 @@ uint32 init_sam_dispinfo_5(TALLOC_CTX *ctx, SAM_DISPINFO_5 *sam, uint32 *num_ent max_data_size = *data_size; if (max_entries==0) - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; if (!(sam->sam=(SAM_ENTRY5 *)talloc(ctx, max_entries*sizeof(SAM_ENTRY5)))) return NT_STATUS_NO_MEMORY; @@ -1890,7 +1890,7 @@ uint32 init_sam_dispinfo_5(TALLOC_CTX *ctx, SAM_DISPINFO_5 *sam, uint32 *num_ent *num_entries = i; *data_size = dsize; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -4499,7 +4499,7 @@ uint32 init_samr_q_lookup_names(TALLOC_CTX *ctx, SAMR_Q_LOOKUP_NAMES * q_u, init_unistr2(&q_u->uni_name[i], name[i], len_name); /* unicode string for machine account */ } - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -4608,7 +4608,7 @@ uint32 init_samr_r_lookup_names(TALLOC_CTX *ctx, SAMR_R_LOOKUP_NAMES * r_u, r_u->status = status; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c index fe4340edec..a6e45ec03a 100644 --- a/source3/rpc_server/srv_lsa_nt.c +++ b/source3/rpc_server/srv_lsa_nt.c @@ -193,7 +193,7 @@ static void init_reply_lookup_names(LSA_R_LOOKUP_NAMES *r_l, if (mapped_count == 0) r_l->status = NT_STATUS_NONE_MAPPED; else - r_l->status = NT_STATUS_NO_PROBLEMO; + r_l->status = NT_STATUS_NOPROBLEMO; } /*************************************************************************** @@ -288,7 +288,7 @@ static void init_reply_lookup_sids(LSA_R_LOOKUP_SIDS *r_l, if (mapped_count == 0) r_l->status = NT_STATUS_NONE_MAPPED; else - r_l->status = NT_STATUS_NO_PROBLEMO; + r_l->status = NT_STATUS_NOPROBLEMO; } /*************************************************************************** @@ -336,7 +336,7 @@ uint32 _lsa_enum_trust_dom(pipes_struct *p, LSA_Q_ENUM_TRUST_DOM *q_u, LSA_R_ENU /* set up the LSA QUERY INFO response */ init_r_enum_trust_dom(r_u, enum_context, dom_name, dom_sid, - dom_name != NULL ? NT_STATUS_NO_PROBLEMO : NT_STATUS_UNABLE_TO_FREE_VM); + dom_name != NULL ? NT_STATUS_NOPROBLEMO : NT_STATUS_UNABLE_TO_FREE_VM); return r_u->status; } @@ -352,7 +352,7 @@ uint32 _lsa_query_info(pipes_struct *p, LSA_Q_QUERY_INFO *q_u, LSA_R_QUERY_INFO char *name = NULL; DOM_SID *sid = NULL; - r_u->status = NT_STATUS_NO_PROBLEMO; + r_u->status = NT_STATUS_NOPROBLEMO; if (!find_policy_by_hnd(p, &q_u->pol, NULL)) return NT_STATUS_INVALID_HANDLE; @@ -442,7 +442,7 @@ uint32 _lsa_query_info(pipes_struct *p, LSA_Q_QUERY_INFO *q_u, LSA_R_QUERY_INFO break; } - if(r_u->status == NT_STATUS_NO_PROBLEMO) { + if(r_u->status == NT_STATUS_NOPROBLEMO) { r_u->undoc_buffer = 0x22000000; /* bizarre */ r_u->info_class = q_u->info_class; } @@ -516,7 +516,7 @@ uint32 _lsa_close(pipes_struct *p, LSA_Q_CLOSE *q_u, LSA_R_CLOSE *r_u) return NT_STATUS_INVALID_HANDLE; close_policy_hnd(p, &q_u->pol); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /*************************************************************************** @@ -560,7 +560,7 @@ uint32 _lsa_enum_privs(pipes_struct *p, LSA_Q_ENUM_PRIVS *q_u, LSA_R_ENUM_PRIVS init_lsa_r_enum_privs(r_u, i+enum_context, PRIV_ALL_INDEX-enum_context, entries); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /*************************************************************************** @@ -595,7 +595,7 @@ uint32 _lsa_priv_get_dispname(pipes_struct *p, LSA_Q_PRIV_GET_DISPNAME *q_u, LSA r_u->ptr_info=0xdeadbeef; r_u->lang_id=q_u->lang_id; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /*************************************************************************** @@ -634,7 +634,7 @@ uint32 _lsa_enum_accounts(pipes_struct *p, LSA_Q_ENUM_ACCOUNTS *q_u, LSA_R_ENUM_ init_lsa_r_enum_accounts(r_u, j); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } @@ -663,7 +663,7 @@ uint32 _lsa_unk_get_connuser(pipes_struct *p, LSA_Q_UNK_GET_CONNUSER *q_u, LSA_R r_u->ptr_dom_name = 1; init_unistr2(&r_u->uni2_dom_name, domname, dlen); - r_u->status = NT_STATUS_NO_PROBLEMO; + r_u->status = NT_STATUS_NOPROBLEMO; return r_u->status; } diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 2e8338c530..a4754beb52 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -151,7 +151,7 @@ static uint32 get_sampwd_entries(SAM_USER_INFO_21 *pw_buf, int start_idx, if (not_finished) return STATUS_MORE_ENTRIES; else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } static uint32 jf_get_sampwd_entries(SAM_USER_INFO_21 *pw_buf, int start_idx, @@ -231,7 +231,7 @@ static uint32 jf_get_sampwd_entries(SAM_USER_INFO_21 *pw_buf, int start_idx, if (not_finished) return STATUS_MORE_ENTRIES; else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } #if 0 /* This function appears to be unused! */ @@ -901,7 +901,7 @@ static BOOL get_group_alias_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM_SID DEBUG(10,("get_group_alias_entries: returning %d entries\n", *p_num_entries)); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -945,7 +945,7 @@ static uint32 get_group_domain_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM_ *p_num_entries = num_entries; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -999,7 +999,7 @@ uint32 _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, SAM sid_to_string(sid_str, &sid); DEBUG(5,("samr_reply_enum_dom_aliases: sid %s\n", sid_str)); - if (get_group_alias_entries(p->mem_ctx, &grp, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES)!=NT_STATUS_NO_PROBLEMO) + if (get_group_alias_entries(p->mem_ctx, &grp, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES)!=NT_STATUS_NOPROBLEMO) return NT_STATUS_ACCESS_DENIED; make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name, num_entries, grp); @@ -1071,7 +1071,7 @@ uint32 _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_R_ MAX_SAM_ENTRIES, acb_mask); #endif unbecome_root(); - if (r_u->status!=STATUS_MORE_ENTRIES && r_u->status!=NT_STATUS_NO_PROBLEMO) { + if (r_u->status!=STATUS_MORE_ENTRIES && r_u->status!=NT_STATUS_NOPROBLEMO) { DEBUG(5, ("get_sampwd_entries: failed\n")); return r_u->status; } @@ -1079,7 +1079,7 @@ uint32 _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_R_ case 0x3: case 0x5: r_u->status = get_group_domain_entries(p->mem_ctx, &grps, &sid, q_u->start_idx, &num_entries, MAX_SAM_ENTRIES); - if (r_u->status != NT_STATUS_NO_PROBLEMO) + if (r_u->status != NT_STATUS_NOPROBLEMO) return NT_STATUS_ACCESS_DENIED; break; default: @@ -1115,7 +1115,7 @@ uint32 _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_R_ return NT_STATUS_NO_MEMORY; } disp_ret = init_sam_dispinfo_1(p->mem_ctx, ctr->sam.info1, &num_entries, &data_size, q_u->start_idx, pass); - if (disp_ret != NT_STATUS_NO_PROBLEMO) + if (disp_ret != NT_STATUS_NOPROBLEMO) return disp_ret; break; case 0x2: @@ -1124,7 +1124,7 @@ uint32 _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_R_ return NT_STATUS_NO_MEMORY; } disp_ret = init_sam_dispinfo_2(p->mem_ctx, ctr->sam.info2, &num_entries, &data_size, q_u->start_idx, pass); - if (disp_ret != NT_STATUS_NO_PROBLEMO) + if (disp_ret != NT_STATUS_NOPROBLEMO) return disp_ret; break; case 0x3: @@ -1133,7 +1133,7 @@ uint32 _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_R_ return NT_STATUS_NO_MEMORY; } disp_ret = init_sam_dispinfo_3(p->mem_ctx, ctr->sam.info3, &num_entries, &data_size, q_u->start_idx, grps); - if (disp_ret != NT_STATUS_NO_PROBLEMO) + if (disp_ret != NT_STATUS_NOPROBLEMO) return disp_ret; break; case 0x4: @@ -1142,7 +1142,7 @@ uint32 _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_R_ return NT_STATUS_NO_MEMORY; } disp_ret = init_sam_dispinfo_4(p->mem_ctx, ctr->sam.info4, &num_entries, &data_size, q_u->start_idx, pass); - if (disp_ret != NT_STATUS_NO_PROBLEMO) + if (disp_ret != NT_STATUS_NOPROBLEMO) return disp_ret; break; case 0x5: @@ -1151,7 +1151,7 @@ uint32 _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_R_ return NT_STATUS_NO_MEMORY; } disp_ret = init_sam_dispinfo_5(p->mem_ctx, ctr->sam.info5, &num_entries, &data_size, q_u->start_idx, grps); - if (disp_ret != NT_STATUS_NO_PROBLEMO) + if (disp_ret != NT_STATUS_NOPROBLEMO) return disp_ret; break; default: @@ -1484,7 +1484,7 @@ uint32 _api_samr_open_user(pipes_struct *p, SAMR_Q_OPEN_USER *q_u, SAMR_R_OPEN_U struct samr_info *info = NULL; BOOL ret; - r_u->status = NT_STATUS_NO_PROBLEMO; + r_u->status = NT_STATUS_NOPROBLEMO; /* find the domain policy handle. */ if (!find_policy_by_hnd(p, &domain_pol, NULL)) @@ -1695,7 +1695,7 @@ uint32 _samr_query_userinfo(pipes_struct *p, SAMR_Q_QUERY_USERINFO *q_u, SAMR_R_ uint32 rid = 0; struct samr_info *info = NULL; - r_u->status=NT_STATUS_NO_PROBLEMO; + r_u->status=NT_STATUS_NOPROBLEMO; /* search for the handle */ if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info)) @@ -1802,7 +1802,7 @@ uint32 _samr_query_usergroups(pipes_struct *p, SAMR_Q_QUERY_USERGROUPS *q_u, SAM struct samr_info *info = NULL; BOOL ret; - r_u->status = NT_STATUS_NO_PROBLEMO; + r_u->status = NT_STATUS_NOPROBLEMO; DEBUG(5,("_samr_query_usergroups: %d\n", __LINE__)); @@ -1852,7 +1852,7 @@ uint32 _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SAMR ZERO_STRUCTP(ctr); - r_u->status = NT_STATUS_NO_PROBLEMO; + r_u->status = NT_STATUS_NOPROBLEMO; DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__)); @@ -2021,7 +2021,7 @@ uint32 _api_samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_CR pdb_free_sam(sam_pass); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -2034,7 +2034,7 @@ uint32 _samr_connect_anon(pipes_struct *p, SAMR_Q_CONNECT_ANON *q_u, SAMR_R_CONN /* set up the SAMR connect_anon response */ - r_u->status = NT_STATUS_NO_PROBLEMO; + r_u->status = NT_STATUS_NOPROBLEMO; /* associate the user's SID with the new handle. */ if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL) @@ -2060,7 +2060,7 @@ uint32 _samr_connect(pipes_struct *p, SAMR_Q_CONNECT *q_u, SAMR_R_CONNECT *r_u) DEBUG(5,("_samr_connect: %d\n", __LINE__)); - r_u->status = NT_STATUS_NO_PROBLEMO; + r_u->status = NT_STATUS_NOPROBLEMO; /* associate the user's SID with the new handle. */ if ((info = (struct samr_info *)malloc(sizeof(struct samr_info))) == NULL) @@ -2084,7 +2084,7 @@ uint32 _samr_connect(pipes_struct *p, SAMR_Q_CONNECT *q_u, SAMR_R_CONNECT *r_u) uint32 _samr_lookup_domain(pipes_struct *p, SAMR_Q_LOOKUP_DOMAIN *q_u, SAMR_R_LOOKUP_DOMAIN *r_u) { - r_u->status = NT_STATUS_NO_PROBLEMO; + r_u->status = NT_STATUS_NOPROBLEMO; if (!find_policy_by_hnd(p, &q_u->connect_pol, NULL)) return NT_STATUS_INVALID_HANDLE; @@ -2143,7 +2143,7 @@ uint32 _samr_enum_domains(pipes_struct *p, SAMR_Q_ENUM_DOMAINS *q_u, SAMR_R_ENUM uint32 num_entries = 2; fstring dom[2]; - r_u->status = NT_STATUS_NO_PROBLEMO; + r_u->status = NT_STATUS_NOPROBLEMO; fstrcpy(dom[0],global_myworkgroup); fstrcpy(dom[1],"Builtin"); @@ -2168,7 +2168,7 @@ uint32 _api_samr_open_alias(pipes_struct *p, SAMR_Q_OPEN_ALIAS *q_u, SAMR_R_OPEN POLICY_HND *alias_pol = &r_u->pol; struct samr_info *info = NULL; - r_u->status = NT_STATUS_NO_PROBLEMO; + r_u->status = NT_STATUS_NOPROBLEMO; /* get the domain policy. */ if (!find_policy_by_hnd(p, &domain_pol, NULL)) @@ -2633,9 +2633,9 @@ uint32 _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u, S rid[0] = BUILTIN_ALIAS_RID_USERS; - init_samr_r_query_useraliases(r_u, num_rids, rid, NT_STATUS_NO_PROBLEMO); + init_samr_r_query_useraliases(r_u, num_rids, rid, NT_STATUS_NOPROBLEMO); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } @@ -2697,7 +2697,7 @@ uint32 _samr_query_aliasmem(pipes_struct *p, SAMR_Q_QUERY_ALIASMEM *q_u, SAMR_R_ } DEBUG(10, ("sid is %s\n", alias_sid_str)); - init_samr_r_query_aliasmem(r_u, num_uids, sid, NT_STATUS_NO_PROBLEMO); + init_samr_r_query_aliasmem(r_u, num_uids, sid, NT_STATUS_NOPROBLEMO); return NT_STATUS_NOPROBLEMO; } @@ -3180,9 +3180,9 @@ uint32 _samr_query_groupinfo(pipes_struct *p, SAMR_Q_QUERY_GROUPINFO *q_u, SAMR_ return NT_STATUS_INVALID_INFO_CLASS; } - init_samr_r_query_groupinfo(r_u, ctr, NT_STATUS_NO_PROBLEMO); + init_samr_r_query_groupinfo(r_u, ctr, NT_STATUS_NOPROBLEMO); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /********************************************************************* @@ -3219,7 +3219,7 @@ uint32 _samr_set_groupinfo(pipes_struct *p, SAMR_Q_SET_GROUPINFO *q_u, SAMR_R_SE if(!add_mapping_entry(&map, TDB_REPLACE)) return NT_STATUS_NO_SUCH_GROUP; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /********************************************************************* @@ -3253,7 +3253,7 @@ uint32 _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_SE if(!add_mapping_entry(&map, TDB_REPLACE)) return NT_STATUS_NO_SUCH_GROUP; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /********************************************************************* @@ -3303,7 +3303,7 @@ uint32 _samr_open_group(pipes_struct *p, SAMR_Q_OPEN_GROUP *q_u, SAMR_R_OPEN_GRO if (!create_policy_hnd(p, &r_u->pol, free_samr_info, (void *)info)) return NT_STATUS_OBJECT_NAME_NOT_FOUND; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /********************************************************************* diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c index 63bbc5f87b..3500a4f3e1 100755 --- a/source3/rpc_server/srv_spoolss.c +++ b/source3/rpc_server/srv_spoolss.c @@ -1110,7 +1110,7 @@ static BOOL api_spoolss_addprintprocessor(pipes_struct *p) automatically set the winprint processor for printer entries later. Used to debug the LexMark Optra S 1855 PCL driver --jerry */ - r_u.status = NT_STATUS_NO_PROBLEMO; + r_u.status = NT_STATUS_NOPROBLEMO; if(!spoolss_io_r_addprintprocessor("", &r_u, rdata, 0)) { DEBUG(0,("spoolss_io_r_addprintprocessor: unable to marshall SPOOL_R_ADDPRINTPROCESSOR.\n")); diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 79c788e67b..d93f320e2f 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -705,7 +705,7 @@ static BOOL srv_spoolss_sendnotify(pipes_struct *p, POLICY_HND *handle) uint32 _spoolss_open_printer_ex( pipes_struct *p, SPOOL_Q_OPEN_PRINTER_EX *q_u, SPOOL_R_OPEN_PRINTER_EX *r_u) { #if 0 - uint32 result = NT_STATUS_NO_PROBLEMO; + uint32 result = NT_STATUS_NOPROBLEMO; #endif UNISTR2 *printername = NULL; @@ -775,7 +775,7 @@ uint32 _spoolss_open_printer_ex( pipes_struct *p, SPOOL_Q_OPEN_PRINTER_EX *q_u, if (handle_is_printserver(p, handle)) { if (printer_default->access_required == 0) { - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } else if ((printer_default->access_required & SERVER_ACCESS_ADMINISTER ) == SERVER_ACCESS_ADMINISTER) { @@ -787,7 +787,7 @@ uint32 _spoolss_open_printer_ex( pipes_struct *p, SPOOL_Q_OPEN_PRINTER_EX *q_u, return ERROR_ACCESS_DENIED; } else if (user.uid == 0 || user_in_list(uidtoname(user.uid), lp_printer_admin(snum))) { - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } else { close_printer_handle(p, handle); @@ -889,7 +889,7 @@ uint32 _spoolss_open_printer_ex( pipes_struct *p, SPOOL_Q_OPEN_PRINTER_EX *q_u, #endif } - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -1035,7 +1035,7 @@ uint32 _spoolss_closeprinter(pipes_struct *p, SPOOL_Q_CLOSEPRINTER *q_u, SPOOL_R if (!close_printer_handle(p, handle)) return ERROR_INVALID_HANDLE; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -1336,7 +1336,7 @@ uint32 _spoolss_getprinterdata(pipes_struct *p, SPOOL_Q_GETPRINTERDATA *q_u, SPO if (*needed > *out_size) return ERROR_MORE_DATA; else { - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } } @@ -1417,7 +1417,7 @@ uint32 _spoolss_rffpcnex(pipes_struct *p, SPOOL_Q_RFFPCNEX *q_u, SPOOL_R_RFFPCNE &Printer->notify.client_hnd)) Printer->notify.client_connected=True; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -2361,7 +2361,7 @@ static uint32 printserver_notify_info(pipes_struct *p, POLICY_HND *hnd, } */ - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************* @@ -2444,7 +2444,7 @@ static uint32 printer_notify_info(pipes_struct *p, POLICY_HND *hnd, SPOOL_NOTIFY info->data[i].id, info->data[i].size, info->data[i].enc_type)); } */ - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -2913,7 +2913,7 @@ static BOOL enum_all_printers_info_1(uint32 flags, NEW_BUFFER *buffer, uint32 of return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -2995,7 +2995,7 @@ static BOOL enum_all_printers_info_1_remote(fstring name, NEW_BUFFER *buffer, ui return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -3064,7 +3064,7 @@ static BOOL enum_all_printers_info_2(NEW_BUFFER *buffer, uint32 offered, uint32 return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -3088,7 +3088,7 @@ static uint32 enumprinters_level1( uint32 flags, fstring name, if (flags & PRINTER_ENUM_NETWORK) return enum_all_printers_info_1_network(buffer, offered, needed, returned); - return NT_STATUS_NO_PROBLEMO; /* NT4sp5 does that */ + return NT_STATUS_NOPROBLEMO; /* NT4sp5 does that */ } /******************************************************************** @@ -3120,7 +3120,7 @@ static uint32 enumprinters_level2( uint32 flags, fstring servername, if (flags & PRINTER_ENUM_REMOTE) return ERROR_INVALID_LEVEL; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -3131,7 +3131,7 @@ static uint32 enumprinters_level5( uint32 flags, fstring servername, uint32 *needed, uint32 *returned) { /* return enum_all_printers_info_5(buffer, offered, needed, returned);*/ - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -3220,7 +3220,7 @@ static uint32 getprinter_level_0(int snum, NEW_BUFFER *buffer, uint32 offered, u return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -3252,7 +3252,7 @@ static uint32 getprinter_level_1(int snum, NEW_BUFFER *buffer, uint32 offered, u return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -3287,7 +3287,7 @@ static uint32 getprinter_level_2(int snum, NEW_BUFFER *buffer, uint32 offered, u return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -3317,7 +3317,7 @@ static uint32 getprinter_level_3(int snum, NEW_BUFFER *buffer, uint32 offered, u return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -3384,7 +3384,7 @@ static uint32 construct_printer_driver_info_1(DRIVER_INFO_1 *info, int snum, fst free_a_printer(&printer,2); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -3442,7 +3442,7 @@ static uint32 construct_printer_driver_info_2(DRIVER_INFO_2 *info, int snum, fst free_a_printer(&printer,2); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -3558,7 +3558,7 @@ static uint32 construct_printer_driver_info_3(DRIVER_INFO_3 *info, int snum, fst free_a_printer(&printer,2); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -3667,7 +3667,7 @@ static uint32 construct_printer_driver_info_6(DRIVER_INFO_6 *info, int snum, fst free_a_printer(&printer,2); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -3698,7 +3698,7 @@ static uint32 getprinterdriver2_level1(fstring servername, fstring architecture, return ERROR_NOT_ENOUGH_MEMORY; status=construct_printer_driver_info_1(info, snum, servername, architecture, version); - if (status != NT_STATUS_NO_PROBLEMO) { + if (status != NT_STATUS_NOPROBLEMO) { safe_free(info); return status; } @@ -3720,7 +3720,7 @@ static uint32 getprinterdriver2_level1(fstring servername, fstring architecture, if (*needed > offered) return ERROR_INSUFFICIENT_BUFFER; else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -3734,7 +3734,7 @@ static uint32 getprinterdriver2_level2(fstring servername, fstring architecture, return ERROR_NOT_ENOUGH_MEMORY; status=construct_printer_driver_info_2(info, snum, servername, architecture, version); - if (status != NT_STATUS_NO_PROBLEMO) { + if (status != NT_STATUS_NOPROBLEMO) { safe_free(info); return status; } @@ -3756,7 +3756,7 @@ static uint32 getprinterdriver2_level2(fstring servername, fstring architecture, if (*needed > offered) return ERROR_INSUFFICIENT_BUFFER; else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -3769,7 +3769,7 @@ static uint32 getprinterdriver2_level3(fstring servername, fstring architecture, ZERO_STRUCT(info); status=construct_printer_driver_info_3(&info, snum, servername, architecture, version); - if (status != NT_STATUS_NO_PROBLEMO) { + if (status != NT_STATUS_NOPROBLEMO) { return status; } @@ -3789,7 +3789,7 @@ static uint32 getprinterdriver2_level3(fstring servername, fstring architecture, if (*needed > offered) return ERROR_INSUFFICIENT_BUFFER; else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -3802,7 +3802,7 @@ static uint32 getprinterdriver2_level6(fstring servername, fstring architecture, ZERO_STRUCT(info); status=construct_printer_driver_info_6(&info, snum, servername, architecture, version); - if (status != NT_STATUS_NO_PROBLEMO) { + if (status != NT_STATUS_NOPROBLEMO) { return status; } @@ -3822,7 +3822,7 @@ static uint32 getprinterdriver2_level6(fstring servername, fstring architecture, if (*needed > offered) return ERROR_INSUFFICIENT_BUFFER; else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -3909,7 +3909,7 @@ uint32 _spoolss_endpageprinter(pipes_struct *p, SPOOL_Q_ENDPAGEPRINTER *q_u, SPO Printer->page_started=False; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /******************************************************************** @@ -4146,7 +4146,7 @@ static uint32 update_printer_sec(POLICY_HND *handle, uint32 level, new_secdesc_ctr = sec_desc_merge(p->mem_ctx, secdesc_ctr, old_secdesc_ctr); if (sec_desc_equal(new_secdesc_ctr->sec, old_secdesc_ctr->sec)) { - result = NT_STATUS_NO_PROBLEMO; + result = NT_STATUS_NOPROBLEMO; goto done; } @@ -4504,7 +4504,7 @@ static uint32 update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level, DEBUG(8,("update_printer\n")); - result = NT_STATUS_NO_PROBLEMO; + result = NT_STATUS_NOPROBLEMO; if (level!=2) { DEBUG(0,("Send a mail to samba@samba.org\n")); @@ -4564,7 +4564,7 @@ static uint32 update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level, if (nt_printer_info_level_equal(printer, old_printer)) { DEBUG(3, ("printer info has not changed\n")); - result = NT_STATUS_NO_PROBLEMO; + result = NT_STATUS_NOPROBLEMO; goto done; } @@ -4660,7 +4660,7 @@ uint32 _spoolss_fcpn(pipes_struct *p, SPOOL_Q_FCPN *q_u, SPOOL_R_FCPN *r_u) free_spool_notify_option(&Printer->notify.option); Printer->notify.client_connected=False; - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -4798,7 +4798,7 @@ static uint32 enumjobs_level1(print_queue_struct *queue, int snum, return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -4853,7 +4853,7 @@ static uint32 enumjobs_level2(print_queue_struct *queue, int snum, return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -4894,7 +4894,7 @@ uint32 _spoolss_enumjobs( pipes_struct *p, SPOOL_Q_ENUMJOBS *q_u, SPOOL_R_ENUMJO if (*returned == 0) { safe_free(queue); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } switch (level) { @@ -5041,7 +5041,7 @@ static uint32 enumprinterdrivers_level1(fstring servername, fstring architecture return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -5117,7 +5117,7 @@ static uint32 enumprinterdrivers_level2(fstring servername, fstring architecture return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -5196,7 +5196,7 @@ static uint32 enumprinterdrivers_level3(fstring servername, fstring architecture return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -5348,7 +5348,7 @@ uint32 _spoolss_enumforms(pipes_struct *p, SPOOL_Q_ENUMFORMS *q_u, SPOOL_R_ENUMF return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; default: safe_free(list); @@ -5436,7 +5436,7 @@ uint32 _spoolss_getform(pipes_struct *p, SPOOL_Q_GETFORM *q_u, SPOOL_R_GETFORM * DEBUGADD(6,("adding form %s [%d] to buffer\n", form_name, i)); smb_io_form_1("", buffer, &form_1, 0); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; default: safe_free(list); @@ -5548,7 +5548,7 @@ static uint32 enumports_level_1(NEW_BUFFER *buffer, uint32 offered, uint32 *need return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -5647,7 +5647,7 @@ static uint32 enumports_level_2(NEW_BUFFER *buffer, uint32 offered, uint32 *need return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -5750,7 +5750,7 @@ static uint32 spoolss_addprinterex_level_2( pipes_struct *p, const UNISTR2 *uni_ srv_spoolss_sendnotify(p, handle); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -5792,7 +5792,7 @@ uint32 _spoolss_addprinterdriver(pipes_struct *p, SPOOL_Q_ADDPRINTERDRIVER *q_u, uint32 level = q_u->level; SPOOL_PRINTER_DRIVER_INFO_LEVEL *info = &q_u->info; - uint32 err = NT_STATUS_NO_PROBLEMO; + uint32 err = NT_STATUS_NOPROBLEMO; NT_PRINTER_DRIVER_INFO_LEVEL driver; struct current_user user; @@ -5803,7 +5803,7 @@ uint32 _spoolss_addprinterdriver(pipes_struct *p, SPOOL_Q_ADDPRINTERDRIVER *q_u, convert_printer_driver_info(info, &driver, level); DEBUG(5,("Cleaning driver's information\n")); - if ((err = clean_up_driver_struct(driver, level, &user)) != NT_STATUS_NO_PROBLEMO ) + if ((err = clean_up_driver_struct(driver, level, &user)) != NT_STATUS_NOPROBLEMO ) goto done; DEBUG(5,("Moving driver to final destination\n")); @@ -5867,7 +5867,7 @@ static uint32 getprinterdriverdir_level_1(UNISTR2 *name, UNISTR2 *uni_environmen if (*needed > offered) return ERROR_INSUFFICIENT_BUFFER; else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -6015,7 +6015,7 @@ uint32 _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, S DEBUG(6,("final values: [%d], [%d]\n", *out_value_len, *out_data_len)); free_a_printer(&printer, 2); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /* @@ -6062,7 +6062,7 @@ uint32 _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, S safe_free(data); - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -6114,7 +6114,7 @@ uint32 _spoolss_setprinterdata( pipes_struct *p, SPOOL_Q_SETPRINTERDATA *q_u, SP old_param.data_len) == 0) { DEBUG(3, ("setprinterdata hasn't changed\n")); - status = NT_STATUS_NO_PROBLEMO; + status = NT_STATUS_NOPROBLEMO; goto done; } } @@ -6321,7 +6321,7 @@ static uint32 enumprintprocessors_level_1(NEW_BUFFER *buffer, uint32 offered, ui return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -6389,7 +6389,7 @@ static uint32 enumprintprocdatatypes_level_1(NEW_BUFFER *buffer, uint32 offered, return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -6451,7 +6451,7 @@ static uint32 enumprintmonitors_level_1(NEW_BUFFER *buffer, uint32 offered, uint return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -6484,7 +6484,7 @@ static uint32 enumprintmonitors_level_2(NEW_BUFFER *buffer, uint32 offered, uint return ERROR_INSUFFICIENT_BUFFER; } else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -6549,7 +6549,7 @@ static uint32 getjob_level_1(print_queue_struct *queue, int count, int snum, uin safe_free(queue); safe_free(info_1); /* I shoud reply something else ... I can't find the good one */ - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } fill_job_info_1(info_1, &(queue[i-1]), i, snum); @@ -6570,7 +6570,7 @@ static uint32 getjob_level_1(print_queue_struct *queue, int count, int snum, uin if (*needed > offered) return ERROR_INSUFFICIENT_BUFFER; else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } @@ -6601,7 +6601,7 @@ static uint32 getjob_level_2(print_queue_struct *queue, int count, int snum, uin safe_free(queue); safe_free(info_2); /* I shoud reply something else ... I can't find the good one */ - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } if (get_a_printer(&ntprinter, 2, lp_servicename(snum)) !=0) { @@ -6629,7 +6629,7 @@ static uint32 getjob_level_2(print_queue_struct *queue, int count, int snum, uin if (*needed > offered) return ERROR_INSUFFICIENT_BUFFER; else - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 1f46ed1bf9..0475b4317c 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_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } /**************************************************************************** @@ -742,7 +742,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_NO_PROBLEMO) + MAXIMUM_ALLOWED_ACCESS, servername, user, &pol)) != NT_STATUS_NOPROBLEMO) { printf ("Error opening printer handle for %s!\n", printername); return result; @@ -758,7 +758,7 @@ static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv switch (result) { - case NT_STATUS_NO_PROBLEMO: + case NT_STATUS_NOPROBLEMO: break; case ERROR_UNKNOWN_PRINTER_DRIVER: @@ -800,7 +800,7 @@ static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv talloc_destroy(mem_ctx); if (result==ERROR_UNKNOWN_PRINTER_DRIVER) - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; else return result; @@ -856,7 +856,7 @@ static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **a continue; - if (result != NT_STATUS_NO_PROBLEMO) + if (result != NT_STATUS_NOPROBLEMO) { printf ("Error getting driver for environment [%s] - %s\n", archi_table[i].long_archi, get_nt_error_msg(result)); @@ -894,7 +894,7 @@ static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **a talloc_destroy(mem_ctx); if (result==ERROR_UNKNOWN_PRINTER_DRIVER) - return NT_STATUS_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; else return result; @@ -952,7 +952,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_NO_PROBLEMO) + != NT_STATUS_NOPROBLEMO) { return result; } @@ -1130,7 +1130,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_NO_PROBLEMO) + != NT_STATUS_NOPROBLEMO) { return result; } @@ -1211,7 +1211,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_NO_PROBLEMO) + != NT_STATUS_NOPROBLEMO) { cli_nt_session_close (cli); return result; @@ -1287,7 +1287,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_NO_PROBLEMO) + if ((result = cli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0)) != NT_STATUS_NOPROBLEMO) { printf ("SetPrinter call failed!\n"); goto done;; @@ -1341,7 +1341,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_NO_PROBLEMO) + archi_table[i].long_archi, argv[1])) != NT_STATUS_NOPROBLEMO) { printf ("Failed to remove driver %s for arch [%s] - error %s!\n", argv[1], archi_table[i].long_archi, get_nt_error_msg(result)); @@ -1355,7 +1355,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_NO_PROBLEMO; + return NT_STATUS_NOPROBLEMO; } diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index cfc8ac6aa1..aa369e61b4 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -162,13 +162,13 @@ Join a domain using the administrator username and password /* Macro for checking RPC error codes to make things more readable */ #define CHECK_RPC_ERR(rpc, msg) \ - if ((result = rpc) != NT_STATUS_NO_PROBLEMO) { \ + if ((result = rpc) != NT_STATUS_NOPROBLEMO) { \ DEBUG(0, (msg ": %s\n", get_nt_error_msg(result))); \ goto done; \ } #define CHECK_RPC_ERR_DEBUG(rpc, debug_args) \ - if ((result = rpc) != NT_STATUS_NO_PROBLEMO) { \ + if ((result = rpc) != NT_STATUS_NOPROBLEMO) { \ DEBUG(0, debug_args); \ goto done; \ } -- cgit