converted another bunch of stuff to NTSTATUS

(This used to be commit 1d36250e338ae0ff9fbbf86019809205dd97d05e)

5 files changed, 37 insertions, 37 deletions

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 96d77ab3cf..8b4a4bcc3d 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -471,7 +471,7 @@ uint32 lsa_lookup_sids(POLICY_HND *hnd, int num_sids, DOM_SID *sids,
 			return r_l.status;
 		}
 
-		result = NT_STATUS_NOPROBLEMO;
+		result = NT_STATUS_OK;
 
 		if (p) {
 			if (t_names.ptr_trans_names != 0
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 2dd9eb0141..2c30e5ba47 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -57,7 +57,7 @@ static void gen_next_creds( struct cli_state *cli, DOM_CRED *new_clnt_cred)
 /****************************************************************************
 do a LSA Logon Control2
 ****************************************************************************/
-BOOL cli_net_logon_ctrl2(struct cli_state *cli, uint32 status_level)
+BOOL cli_net_logon_ctrl2(struct cli_state *cli, NTSTATUS status_level)
 {
   prs_struct rbuf;
   prs_struct buf; 
@@ -446,7 +446,7 @@ uint32 cli_net_sam_logon(struct cli_state *cli, NET_ID_INFO_CTR *ctr,
 	result = cli_net_sam_logon_internal(cli, ctr, user_info3, 
                                             validation_level);
 
-	if(result == NT_STATUS_NOPROBLEMO) {
+	if(result == NT_STATUS_OK) {
 		DEBUG(10,("cli_net_sam_logon: Success \n"));
 	} else if (result == NT_STATUS_INVALID_INFO_CLASS) {
 		DEBUG(10,("cli_net_sam_logon: STATUS INVALID INFO CLASS \n"));
diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index a06f3afb6a..9c93ec02d5 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -70,7 +70,7 @@ uint32 spoolss_enum_printerdrivers(const char *srv_name, const char *environment
 
 	        if(spoolss_io_r_enumprinterdrivers("", &r_o, &rbuf, 0)) 
 		{
-			if (r_o.status != NT_STATUS_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
 			{
 				DEBUG(3,("SPOOLSS_ENUMPRINTERDRIVERS:  %s\n", get_nt_error_msg(r_o.status)));
 			}
@@ -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_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
 			{
                         	/* 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_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
 			{
 				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_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
 			{
 				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_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
 			{
 				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_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
 			{
 				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_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
 			{
 				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_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
                         {
 				/* 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_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
 			{
 				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_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
 			{
 				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_NOPROBLEMO)
+			if (r_o.status != NT_STATUS_OK)
 			{
                         	/* report error code */
                         	DEBUG(3,("SPOOLSS_ADDPRINTERDRIVER: %s\n", get_nt_error_msg(r_o.status)));
diff --git a/source3/rpc_client/cli_spoolss_notify.c b/source3/rpc_client/cli_spoolss_notify.c
index 8aba2a3242..ca2e4f7ec0 100644
--- a/source3/rpc_client/cli_spoolss_notify.c
+++ b/source3/rpc_client/cli_spoolss_notify.c
@@ -132,7 +132,7 @@ BOOL spoolss_connect_to_client( struct cli_state *cli, char *remote_machine)
  do a reply open printer
 ****************************************************************************/
 
-BOOL cli_spoolss_reply_open_printer(struct cli_state *cli, char *printer, uint32 localprinter, uint32 type, uint32 *status, POLICY_HND *handle)
+BOOL cli_spoolss_reply_open_printer(struct cli_state *cli, char *printer, uint32 localprinter, uint32 type, NTSTATUS *status, POLICY_HND *handle)
 {
 	prs_struct rbuf;
 	prs_struct buf; 
@@ -188,7 +188,7 @@ BOOL cli_spoolss_reply_open_printer(struct cli_state *cli, char *printer, uint32
 ****************************************************************************/
 
 BOOL cli_spoolss_reply_rrpcn(struct cli_state *cli, POLICY_HND *handle, 
-			     uint32 change_low, uint32 change_high, uint32 *status)
+			     uint32 change_low, uint32 change_high, NTSTATUS *status)
 {
 	prs_struct rbuf;
 	prs_struct buf; 
@@ -242,7 +242,7 @@ BOOL cli_spoolss_reply_rrpcn(struct cli_state *cli, POLICY_HND *handle,
  do a reply open printer
 ****************************************************************************/
 
-BOOL cli_spoolss_reply_close_printer(struct cli_state *cli, POLICY_HND *handle, uint32 *status)
+BOOL cli_spoolss_reply_close_printer(struct cli_state *cli, POLICY_HND *handle, NTSTATUS *status)
 {
 	prs_struct rbuf;
 	prs_struct buf; 
diff --git a/source3/rpc_client/msrpc_spoolss.c b/source3/rpc_client/msrpc_spoolss.c
index 4c0d3f4999..288c7f63cb 100644
--- a/source3/rpc_client/msrpc_spoolss.c
+++ b/source3/rpc_client/msrpc_spoolss.c
@@ -227,7 +227,7 @@ nt spoolss query
 BOOL msrpc_spoolss_enum_printers(char* srv_name, uint32 flags, 
 				 uint32 level, PRINTER_INFO_CTR ctr)
 {
-	uint32 status;
+	NTSTATUS status;
 	NEW_BUFFER buffer;
 	uint32 needed;
 	uint32 returned;
@@ -250,7 +250,7 @@ BOOL msrpc_spoolss_enum_printers(char* srv_name, uint32 flags,
 					     needed, &needed, &returned);
 	}
 	
-	if (status!=NT_STATUS_NOPROBLEMO)
+	if (status!=NT_STATUS_OK)
 	{
 		DEBUG(0,("spoolss_enum_printers: %s\n", get_nt_error_msg(status)));
 		if (mem_ctx)
@@ -290,7 +290,7 @@ nt spoolss query
 BOOL msrpc_spoolss_enum_ports(char* srv_name, 
 				 uint32 level, PORT_INFO_CTR *ctr)
 {
-	uint32 status;
+	NTSTATUS status;
 	NEW_BUFFER buffer;
 	uint32 needed;
 	uint32 returned;
@@ -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_NOPROBLEMO)
+	if (status!=NT_STATUS_OK)
 	{
 		if (mem_ctx)
 			talloc_destroy(mem_ctx);
@@ -362,7 +362,7 @@ uint32 msrpc_spoolss_getprinterdata( const char* printer_name,
                                 void *fn)
 {
         POLICY_HND hnd;
-        uint32 status;
+        NTSTATUS status;
         uint32 needed;
         uint32 size;
         char *data;
@@ -405,7 +405,7 @@ uint32 msrpc_spoolss_getprinterdata( const char* printer_name,
 	if (mem_ctx)
 		talloc_destroy(mem_ctx);
 
-        if (status != NT_STATUS_NOPROBLEMO) 
+        if (status != NT_STATUS_OK) 
 	{
                 if (!spoolss_closeprinter(&hnd))
                         return NT_STATUS_ACCESS_DENIED;
@@ -429,7 +429,7 @@ BOOL msrpc_spoolss_enum_jobs( const char* printer_name,
                                 void ***ctr, JOB_INFO_FN(fn))
 {
         POLICY_HND hnd;
-        uint32 status;
+        NTSTATUS status;
         NEW_BUFFER buffer;
         uint32 needed;
         uint32 returned;
@@ -462,7 +462,7 @@ BOOL msrpc_spoolss_enum_jobs( const char* printer_name,
 	if (mem_ctx)
 		talloc_destroy(mem_ctx);
 		
-        if (status!=NT_STATUS_NOPROBLEMO) {
+        if (status!=NT_STATUS_OK) {
                 if (!spoolss_closeprinter(&hnd))
                         return False;
                 return False;
@@ -482,7 +482,7 @@ BOOL msrpc_spoolss_enum_printerdata( const char* printer_name,
 		const char* station, const char* user_name )
 {
 	POLICY_HND hnd;
-	uint32 status;
+	NTSTATUS status;
 	uint32 idx;
 	uint32 valuelen;
 	uint16 *value;
@@ -540,7 +540,7 @@ BOOL msrpc_spoolss_enum_printerdata( const char* printer_name,
 				 value, rvaluelen, type, datalen, data, rdatalen);
 
 	
-	if (status!=NT_STATUS_NOPROBLEMO) {
+	if (status!=NT_STATUS_OK) {
 		/* 
 		 * the check on this if statement is redundant
 		 * since is the status is bad we're going to 
@@ -563,7 +563,7 @@ BOOL msrpc_spoolss_getprinter( const char* printer_name, const uint32 level,
                 PRINTER_INFO_CTR ctr)
 {
         POLICY_HND hnd;
-        uint32 status=0;
+        NTSTATUS status=0;
         NEW_BUFFER buffer;
         uint32 needed=1000;
 	TALLOC_CTX *mem_ctx = NULL;
@@ -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_NOPROBLEMO)
+        if (status!=NT_STATUS_OK)
 	{
 		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_NOPROBLEMO) {
+        if (status!=NT_STATUS_OK) {
                 if (!spoolss_closeprinter(&hnd))
                         return False;
                 return False;
@@ -636,7 +636,7 @@ BOOL msrpc_spoolss_getprinterdriver( const char* printer_name,
                 PRINTER_DRIVER_CTR ctr)
 {
         POLICY_HND hnd;
-        uint32 status=0;
+        NTSTATUS status=0;
         NEW_BUFFER buffer;
         uint32 needed;
 	TALLOC_CTX *mem_ctx = NULL;
@@ -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_NOPROBLEMO)
+        if (status!=NT_STATUS_OK)
 	{
 		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_NOPROBLEMO) {
+        if (status!=NT_STATUS_OK) {
                 if (!spoolss_closeprinter(&hnd))
                         return False;
                 return False;
@@ -704,7 +704,7 @@ BOOL msrpc_spoolss_enumprinterdrivers( const char* srv_name,
                 const char *environment, const uint32 level,
                 PRINTER_DRIVER_CTR ctr)
 {
-        uint32 status=0;
+        NTSTATUS status=0;
         NEW_BUFFER buffer;
         uint32 needed;
         uint32 returned;
@@ -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_NOPROBLEMO)
+        if (status!=NT_STATUS_OK)
 	{
 		if (mem_ctx)
 			talloc_destroy(mem_ctx);
@@ -766,7 +766,7 @@ nt spoolss query
 ****************************************************************************/
 BOOL msrpc_spoolss_getprinterdriverdir(char* srv_name, char* env_name, uint32 level, DRIVER_DIRECTORY_CTR ctr)
 {
-        uint32 status;
+        NTSTATUS status;
         NEW_BUFFER buffer;
         uint32 needed;
 	TALLOC_CTX *mem_ctx = NULL;
@@ -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_NOPROBLEMO)
+        if (status!=NT_STATUS_OK)
 	{
 		if (mem_ctx)
 			talloc_destroy(mem_ctx);