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)

2 files changed, 21 insertions, 21 deletions

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);