converted another bunch of stuff to NTSTATUS

(This used to be commit 1d36250e338ae0ff9fbbf86019809205dd97d05e)

8 files changed, 94 insertions, 94 deletions

diff --git a/source3/rpcclient/cmd_dfs.c b/source3/rpcclient/cmd_dfs.c
index 8059f42f2f..2b47028745 100644
--- a/source3/rpcclient/cmd_dfs.c
+++ b/source3/rpcclient/cmd_dfs.c
@@ -53,7 +53,7 @@ static uint32 cmd_dfs_exist(struct cli_state *cli, int argc, char **argv)
 
 	result = cli_dfs_exist(cli, mem_ctx, &dfs_exists);
 
-	if (result == NT_STATUS_NOPROBLEMO)
+	if (result == NT_STATUS_OK)
 		printf("dfs is %spresent\n", dfs_exists ? "" : "not ");
 
 	cli_nt_session_close(cli);
@@ -252,7 +252,7 @@ static uint32 cmd_dfs_enum(struct cli_state *cli, int argc, char **argv)
 	/* Call RPC function */
 
 	if ((result = cli_dfs_enum(cli, mem_ctx, info_level, &ctr)) 
-	    == NT_STATUS_NOPROBLEMO) {
+	    == NT_STATUS_OK) {
 	    
 		/* Print results */
 		display_dfs_info_ctr(&ctr);
@@ -302,7 +302,7 @@ static uint32 cmd_dfs_getinfo(struct cli_state *cli, int argc, char **argv)
 
 	if ((result = cli_dfs_get_info(cli, mem_ctx, entrypath, servername, 
 				       sharename, info_level, &ctr))
-	    == NT_STATUS_NOPROBLEMO) {
+	    == NT_STATUS_OK) {
 
 		/* Print results */
 
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index a34650b807..3d14a66cfe 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -59,7 +59,7 @@ static uint32 cmd_lsa_query_info_policy(struct cli_state *cli, int argc, char **
 
 	if ((result = cli_lsa_open_policy(cli, mem_ctx, True, 
 					  SEC_RIGHTS_MAXIMUM_ALLOWED,
-					  &pol)) != NT_STATUS_NOPROBLEMO) {
+					  &pol)) != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -69,7 +69,7 @@ static uint32 cmd_lsa_query_info_policy(struct cli_state *cli, int argc, char **
 
 	if ((result = cli_lsa_query_info_policy(cli, mem_ctx, &pol, info_class, 
 						domain_name, &dom_sid)) 
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -125,7 +125,7 @@ static uint32 cmd_lsa_lookup_names(struct cli_state *cli, int argc, char **argv)
 
 	if ((result = cli_lsa_open_policy(cli, mem_ctx, True, 
 					  SEC_RIGHTS_MAXIMUM_ALLOWED,
-					  &pol)) != NT_STATUS_NOPROBLEMO) {
+					  &pol)) != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -135,7 +135,7 @@ static uint32 cmd_lsa_lookup_names(struct cli_state *cli, int argc, char **argv)
 
 	if ((result = cli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 1, 
 		&argv[1], &sids, &types, &num_names) !=
-	     NT_STATUS_NOPROBLEMO)) {
+	     NT_STATUS_OK)) {
 		goto done;
 	}
 
@@ -193,7 +193,7 @@ static uint32 cmd_lsa_lookup_sids(struct cli_state *cli, int argc, char **argv)
 
 	if ((result = cli_lsa_open_policy(cli, mem_ctx, True, 
 					  SEC_RIGHTS_MAXIMUM_ALLOWED,
-					  &pol)) != NT_STATUS_NOPROBLEMO) {
+					  &pol)) != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -216,7 +216,7 @@ static uint32 cmd_lsa_lookup_sids(struct cli_state *cli, int argc, char **argv)
 
 	if ((result = cli_lsa_lookup_sids(cli, mem_ctx, &pol, argc - 1, sids, 
 					  &names, &types, &num_names) !=
-	     NT_STATUS_NOPROBLEMO)) {
+	     NT_STATUS_OK)) {
 		goto done;
 	}
 
@@ -286,7 +286,7 @@ static uint32 cmd_lsa_enum_trust_dom(struct cli_state *cli, int argc, char **arg
 
 	if ((result = cli_lsa_open_policy(cli, mem_ctx, True, 
 					  SEC_RIGHTS_MAXIMUM_ALLOWED,
-					  &pol)) != NT_STATUS_NOPROBLEMO) {
+					  &pol)) != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -297,7 +297,7 @@ static uint32 cmd_lsa_enum_trust_dom(struct cli_state *cli, int argc, char **arg
 	if ((result = cli_lsa_enum_trust_dom(cli, mem_ctx, &pol, &enum_ctx,
 					     &num_domains, &domain_names,
 					     &domain_sids) 
-	     != NT_STATUS_NOPROBLEMO)) {
+	     != NT_STATUS_OK)) {
 		goto done;
 	}
 
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 549e21e25e..410fd7fb0a 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -49,7 +49,7 @@ static uint32 cmd_netlogon_logon_ctrl2(struct cli_state *cli, int argc,
 	}
 
 	if ((result = cli_netlogon_logon_ctrl2(cli, mem_ctx, query_level))
-	     != NT_STATUS_NOPROBLEMO) {
+	     != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -87,7 +87,7 @@ static uint32 cmd_netlogon_logon_ctrl(struct cli_state *cli, int argc,
 
 #if 0
 	if ((result = cli_netlogon_logon_ctrl(cli, mem_ctx, query_level))
-	     != NT_STATUS_NOPROBLEMO) {
+	     != NT_STATUS_OK) {
 		goto done;
 	}
 #endif
diff --git a/source3/rpcclient/cmd_reg.c b/source3/rpcclient/cmd_reg.c
index 41814fd41e..180e334fe9 100644
--- a/source3/rpcclient/cmd_reg.c
+++ b/source3/rpcclient/cmd_reg.c
@@ -973,7 +973,7 @@ static uint32 cmd_reg_shutdown(struct cli_state *cli, int argc, char **argv)
 	/* create an entry */
 	result = cli_reg_shutdown(cli, mem_ctx, srv_name, msg, timeout, flgs);
 
-	if (result == NT_STATUS_NOPROBLEMO)
+	if (result == NT_STATUS_OK)
 		DEBUG(5,("cmd_reg_shutdown: query succeeded\n"));
 	else
 		DEBUG(5,("cmd_reg_shutdown: query failed\n"));
@@ -1017,7 +1017,7 @@ static uint32 cmd_reg_abort_shutdown(struct cli_state *cli, int argc, char **arg
 
 	result = cli_reg_abort_shutdown(cli, mem_ctx, srv_name);
 
-	if (result == NT_STATUS_NOPROBLEMO)
+	if (result == NT_STATUS_OK)
 		DEBUG(5,("cmd_reg_abort_shutdown: query succeeded\n"));
 	else
 		DEBUG(5,("cmd_reg_abort_shutdown: query failed\n"));
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 6e8aa23a08..fb0916b4a5 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -179,7 +179,7 @@ static uint32 cmd_samr_query_user(struct cli_state *cli, int argc, char **argv)
 	
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
 				       &connect_pol)) !=
-	    NT_STATUS_NOPROBLEMO) {
+	    NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -188,7 +188,7 @@ static uint32 cmd_samr_query_user(struct cli_state *cli, int argc, char **argv)
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	     != NT_STATUS_NOPROBLEMO) {
+	     != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -197,7 +197,7 @@ static uint32 cmd_samr_query_user(struct cli_state *cli, int argc, char **argv)
 	if ((result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
 					 MAXIMUM_ALLOWED_ACCESS,
 					 user_rid, &user_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -207,7 +207,7 @@ static uint32 cmd_samr_query_user(struct cli_state *cli, int argc, char **argv)
 
 	if ((result = cli_samr_query_userinfo(cli, mem_ctx, &user_pol, 
 					      info_level, &user_ctr)) 
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -307,7 +307,7 @@ static uint32 cmd_samr_query_group(struct cli_state *cli, int argc, char **argv)
 
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
 				       &connect_pol)) !=
-	    NT_STATUS_NOPROBLEMO) {
+	    NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -316,7 +316,7 @@ static uint32 cmd_samr_query_group(struct cli_state *cli, int argc, char **argv)
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	     != NT_STATUS_NOPROBLEMO) {
+	     != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -325,7 +325,7 @@ static uint32 cmd_samr_query_group(struct cli_state *cli, int argc, char **argv)
 	if ((result = cli_samr_open_group(cli, mem_ctx, &domain_pol,
 					  MAXIMUM_ALLOWED_ACCESS,
 					  group_rid, &group_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -335,7 +335,7 @@ static uint32 cmd_samr_query_group(struct cli_state *cli, int argc, char **argv)
 
 	if ((result = cli_samr_query_groupinfo(cli, mem_ctx, &group_pol, 
 					       info_level, &group_ctr)) 
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -397,7 +397,7 @@ static uint32 cmd_samr_query_usergroups(struct cli_state *cli, int argc, char **
 		
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
 				       &connect_pol)) !=
-	    NT_STATUS_NOPROBLEMO) {
+	    NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -406,7 +406,7 @@ static uint32 cmd_samr_query_usergroups(struct cli_state *cli, int argc, char **
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	     != NT_STATUS_NOPROBLEMO) {
+	     != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -415,7 +415,7 @@ static uint32 cmd_samr_query_usergroups(struct cli_state *cli, int argc, char **
 	if ((result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
 					 MAXIMUM_ALLOWED_ACCESS,
 					 user_rid, &user_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -423,7 +423,7 @@ static uint32 cmd_samr_query_usergroups(struct cli_state *cli, int argc, char **
 
 	if ((result = cli_samr_query_usergroups(cli, mem_ctx, &user_pol,
 						&num_groups, &user_gids))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -484,7 +484,7 @@ static uint32 cmd_samr_query_groupmem(struct cli_state *cli, int argc, char **ar
 
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
 				       &connect_pol)) !=
-	    NT_STATUS_NOPROBLEMO) {
+	    NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -493,7 +493,7 @@ static uint32 cmd_samr_query_groupmem(struct cli_state *cli, int argc, char **ar
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	     != NT_STATUS_NOPROBLEMO) {
+	     != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -502,7 +502,7 @@ static uint32 cmd_samr_query_groupmem(struct cli_state *cli, int argc, char **ar
 	if ((result = cli_samr_open_group(cli, mem_ctx, &domain_pol,
 					  MAXIMUM_ALLOWED_ACCESS,
 					  group_rid, &group_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -511,7 +511,7 @@ static uint32 cmd_samr_query_groupmem(struct cli_state *cli, int argc, char **ar
 	if ((result = cli_samr_query_groupmem(cli, mem_ctx, &group_pol,
 					      &num_members, &group_rids,
 					      &group_attrs))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -568,7 +568,7 @@ static uint32 cmd_samr_enum_dom_groups(struct cli_state *cli, int argc,
 
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
 				       &connect_pol)) !=
-	    NT_STATUS_NOPROBLEMO) {
+	    NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -579,7 +579,7 @@ static uint32 cmd_samr_enum_dom_groups(struct cli_state *cli, int argc,
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	     != NT_STATUS_NOPROBLEMO) {
+	     != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -647,7 +647,7 @@ static uint32 cmd_samr_query_aliasmem(struct cli_state *cli, int argc,
 
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
 				       &connect_pol)) != 
-	    NT_STATUS_NOPROBLEMO) {
+	    NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -658,7 +658,7 @@ static uint32 cmd_samr_query_aliasmem(struct cli_state *cli, int argc,
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	     != NT_STATUS_NOPROBLEMO) {
+	     != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -669,7 +669,7 @@ static uint32 cmd_samr_query_aliasmem(struct cli_state *cli, int argc,
 	if ((result = cli_samr_open_alias(cli, mem_ctx, &domain_pol,
 					  MAXIMUM_ALLOWED_ACCESS,
 					  alias_rid, &alias_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -677,7 +677,7 @@ static uint32 cmd_samr_query_aliasmem(struct cli_state *cli, int argc,
 
 	if ((result = cli_samr_query_aliasmem(cli, mem_ctx, &alias_pol,
 					      &num_members, &alias_sids))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -738,7 +738,7 @@ static uint32 cmd_samr_query_dispinfo(struct cli_state *cli, int argc,
 
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
 				       &connect_pol)) 
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -749,7 +749,7 @@ static uint32 cmd_samr_query_dispinfo(struct cli_state *cli, int argc,
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS, 
 					   &domain_sid, &domain_pol))
-	     != NT_STATUS_NOPROBLEMO) {
+	     != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -824,7 +824,7 @@ static uint32 cmd_samr_query_dominfo(struct cli_state *cli, int argc,
 
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
 				       &connect_pol)) 
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -835,7 +835,7 @@ static uint32 cmd_samr_query_dominfo(struct cli_state *cli, int argc,
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -845,7 +845,7 @@ static uint32 cmd_samr_query_dominfo(struct cli_state *cli, int argc,
 
 	if ((result = cli_samr_query_dom_info(cli, mem_ctx, &domain_pol,
 					      switch_value, &ctr))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -912,7 +912,7 @@ static uint32 cmd_samr_create_dom_user(struct cli_state *cli, int argc,
 
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
 				       &connect_pol)) 
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -923,7 +923,7 @@ static uint32 cmd_samr_create_dom_user(struct cli_state *cli, int argc,
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -937,7 +937,7 @@ static uint32 cmd_samr_create_dom_user(struct cli_state *cli, int argc,
 	if ((result = cli_samr_create_dom_user(cli, mem_ctx, &domain_pol,
 					       acct_name, acb_info, unknown,
 					       &user_pol, &user_rid))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -992,7 +992,7 @@ static uint32 cmd_samr_lookup_names(struct cli_state *cli, int argc,
 
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
 				       &connect_pol)) 
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -1001,7 +1001,7 @@ static uint32 cmd_samr_lookup_names(struct cli_state *cli, int argc,
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -1018,7 +1018,7 @@ static uint32 cmd_samr_lookup_names(struct cli_state *cli, int argc,
 	if ((result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol,
 					    flags, num_names, names,
 					    &num_rids, &rids, &name_types))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -1076,7 +1076,7 @@ static uint32 cmd_samr_lookup_rids(struct cli_state *cli, int argc,
 
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
 				       &connect_pol)) 
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -1085,7 +1085,7 @@ static uint32 cmd_samr_lookup_rids(struct cli_state *cli, int argc,
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -1102,7 +1102,7 @@ static uint32 cmd_samr_lookup_rids(struct cli_state *cli, int argc,
 	if ((result = cli_samr_lookup_rids(cli, mem_ctx, &domain_pol,
 					   flags, num_rids, rids,
 					   &num_names, &names, &name_types))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -1154,14 +1154,14 @@ static uint32 cmd_samr_delete_dom_user(struct cli_state *cli, int argc,
 
 	if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
 				       &connect_pol)) 
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
 	if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
 					   MAXIMUM_ALLOWED_ACCESS,
 					   &domain_sid, &domain_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
@@ -1175,14 +1175,14 @@ static uint32 cmd_samr_delete_dom_user(struct cli_state *cli, int argc,
 						    flags, 1, &argv[1],
 						    &num_rids, &user_rids,
 						    &name_types))
-		    != NT_STATUS_NOPROBLEMO) {
+		    != NT_STATUS_OK) {
 			goto done;
 		}
 
 		if ((result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
 						 MAXIMUM_ALLOWED_ACCESS,
 						 user_rids[0], &user_pol))
-		    != NT_STATUS_NOPROBLEMO) {
+		    != NT_STATUS_OK) {
 			goto done;
 		}
 	}
@@ -1190,7 +1190,7 @@ static uint32 cmd_samr_delete_dom_user(struct cli_state *cli, int argc,
 	/* Delete user */
 
 	if ((result = cli_samr_delete_dom_user(cli, mem_ctx, &user_pol))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto done;
 	}
 
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 <printername>\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 <printername> [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 <printername> [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<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()))
@@ -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 <name> <shared name> <driver> <port>\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 <printer> <driver>\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 <driver>\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;		
 }
 
 
diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index b74dc5a833..63d84db9c8 100644
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -212,7 +212,7 @@ static uint32 cmd_srvsvc_srv_query_info(struct cli_state *cli, int argc,
 
 	if ((result = cli_srvsvc_net_srv_get_info(cli, mem_ctx, info_level,
 						  &ctr)
-	     != NT_STATUS_NOPROBLEMO)) {
+	     != NT_STATUS_OK)) {
 		goto done;
 	}
 
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index d833043401..d49fd13340 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -213,13 +213,13 @@ void fetch_domain_sid(struct cli_state *cli)
 	
 	if ((result = cli_lsa_open_policy(cli, mem_ctx, True, 
 					  SEC_RIGHTS_MAXIMUM_ALLOWED,
-					  &pol) != NT_STATUS_NOPROBLEMO)) {
+					  &pol) != NT_STATUS_OK)) {
 		goto error;
 	}
 
 	if ((result = cli_lsa_query_info_policy(cli, mem_ctx, &pol, info_class, 
 						domain_name, &domain_sid))
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		goto error;
 	}
 
@@ -234,7 +234,7 @@ void fetch_domain_sid(struct cli_state *cli)
  error:
 	fprintf(stderr, "could not obtain sid for domain %s\n", cli->domain);
 
-	if (result != NT_STATUS_NOPROBLEMO) {
+	if (result != NT_STATUS_OK) {
 		fprintf(stderr, "error: %s\n", get_nt_error_msg(result));
 	}
 
@@ -327,7 +327,7 @@ static uint32 cmd_debuglevel(struct cli_state *cli, int argc, char **argv)
 {
 	if (argc > 2) {
 		printf("Usage: %s [debuglevel]\n", argv[0]);
-		return NT_STATUS_NOPROBLEMO;
+		return NT_STATUS_OK;
 	}
 
 	if (argc == 2) {
@@ -336,13 +336,13 @@ static uint32 cmd_debuglevel(struct cli_state *cli, int argc, char **argv)
 
 	printf("debuglevel is %d\n", DEBUGLEVEL);
 
-	return NT_STATUS_NOPROBLEMO;
+	return NT_STATUS_OK;
 }
 
 static uint32 cmd_quit(struct cli_state *cli, int argc, char **argv)
 {
 	exit(0);
-	return NT_STATUS_NOPROBLEMO; /* NOTREACHED */
+	return NT_STATUS_OK; /* NOTREACHED */
 }
 
 /* Build in rpcclient commands */