converted another bunch of stuff to NTSTATUS

(This used to be commit 1d36250e338ae0ff9fbbf86019809205dd97d05e)

6 files changed, 33 insertions, 33 deletions

diff --git a/source3/nsswitch/winbindd_glue.c b/source3/nsswitch/winbindd_glue.c
index 28ccfb2f03..e9792c6d47 100644
--- a/source3/nsswitch/winbindd_glue.c
+++ b/source3/nsswitch/winbindd_glue.c
@@ -79,13 +79,13 @@ BOOL wb_lsa_open_policy(char *server, BOOL sec_qos, uint32 des_access,
 				     des_access, &pol->handle);
 
  done:
-	if (result != NT_STATUS_NOPROBLEMO && pol->cli) {
+	if (result != NT_STATUS_OK && pol->cli) {
 		if (pol->cli->initialised)
 			cli_shutdown(pol->cli);
 		free(pol->cli);
 	}
 
-	return (result == NT_STATUS_NOPROBLEMO);
+	return (result == NT_STATUS_OK);
 }
 
 /****************************************************************************
@@ -99,7 +99,7 @@ BOOL wb_lsa_enum_trust_dom(CLI_POLICY_HND *hnd, uint32 *enum_ctx,
 	ret = cli_lsa_enum_trust_dom(hnd->cli, hnd->mem_ctx, &hnd->handle,
 				     enum_ctx, num_doms, names, sids);
 
-	return (ret == NT_STATUS_NOPROBLEMO);
+	return (ret == NT_STATUS_OK);
 }
 
 /****************************************************************************
@@ -113,7 +113,7 @@ BOOL wb_lsa_query_info_pol(CLI_POLICY_HND *hnd, uint16 info_class,
 	ret = cli_lsa_query_info_policy(hnd->cli, hnd->mem_ctx, &hnd->handle,
 					info_class, domain_name, domain_sid);
 
-	return (ret == NT_STATUS_NOPROBLEMO);
+	return (ret == NT_STATUS_OK);
 }
 
 /****************************************************************************
@@ -127,7 +127,7 @@ BOOL wb_lsa_lookup_names(CLI_POLICY_HND *hnd, int num_names, char **names,
 	ret = cli_lsa_lookup_names(hnd->cli, hnd->mem_ctx, &hnd->handle,
 				   num_names, names, sids, types, num_sids);
 
-	return (ret == NT_STATUS_NOPROBLEMO);
+	return (ret == NT_STATUS_OK);
 }
 
 /****************************************************************************
@@ -141,7 +141,7 @@ BOOL wb_lsa_lookup_sids(CLI_POLICY_HND *hnd, int num_sids, DOM_SID *sids,
 	ret = cli_lsa_lookup_sids(hnd->cli, hnd->mem_ctx, &hnd->handle,
 				  num_sids, sids, names, types, num_names);
 
-	return (ret == NT_STATUS_NOPROBLEMO);
+	return (ret == NT_STATUS_OK);
 }
 
 /****************************************************************************
@@ -153,7 +153,7 @@ BOOL wb_lsa_close(CLI_POLICY_HND *hnd)
 
 	ret = cli_lsa_close(hnd->cli, hnd->mem_ctx, &hnd->handle);
 
-	return (ret == NT_STATUS_NOPROBLEMO);
+	return (ret == NT_STATUS_OK);
 }
 
 
@@ -166,7 +166,7 @@ BOOL wb_samr_close(CLI_POLICY_HND *hnd)
 
 	ret = cli_samr_close(hnd->cli, hnd->mem_ctx, &hnd->handle);
 
-	return (ret == NT_STATUS_NOPROBLEMO);
+	return (ret == NT_STATUS_OK);
 }
 
 
@@ -225,13 +225,13 @@ BOOL wb_samr_connect(char *server, uint32 access_mask, CLI_POLICY_HND *pol)
 				  access_mask, &pol->handle);
 
  done:
-	if (result != NT_STATUS_NOPROBLEMO && pol->cli) {
+	if (result != NT_STATUS_OK && pol->cli) {
 		if (pol->cli->initialised)
 			cli_shutdown(pol->cli);
 		free(pol->cli);
 	}
 
-	return (result == NT_STATUS_NOPROBLEMO);
+	return (result == NT_STATUS_OK);
 }
 
 
@@ -250,7 +250,7 @@ BOOL wb_samr_open_domain(CLI_POLICY_HND *connect_pol, uint32 ace_perms,
 				   sid,
 				   &domain_pol->handle);
 
-	if (ret == NT_STATUS_NOPROBLEMO) {
+	if (ret == NT_STATUS_OK) {
 		domain_pol->cli = connect_pol->cli;
 		domain_pol->mem_ctx = connect_pol->mem_ctx;
 		return True;
@@ -271,7 +271,7 @@ uint32 wb_samr_enum_dom_groups(CLI_POLICY_HND *pol, uint32 *start_idx,
 	ret = cli_samr_enum_dom_groups(pol->cli, pol->mem_ctx, &pol->handle,
 				       start_idx, size, sam, num_sam_groups);
 
-	return (ret == NT_STATUS_NOPROBLEMO);
+	return (ret == NT_STATUS_OK);
 }
 
 /****************************************************************************
@@ -287,20 +287,20 @@ BOOL wb_get_samr_query_userinfo(CLI_POLICY_HND *pol, uint32 info_level,
 	if ((result = cli_samr_open_user(pol->cli, pol->mem_ctx, 
 					 &pol->handle, MAXIMUM_ALLOWED_ACCESS,
 					 user_rid, &user_pol)) 
-	    != NT_STATUS_NOPROBLEMO)
+	    != NT_STATUS_OK)
 		goto done;
 
 	got_user_pol = True;
 
 	if ((result = cli_samr_query_userinfo(pol->cli, pol->mem_ctx,
 					      &user_pol, info_level, ctr))
-	    != NT_STATUS_NOPROBLEMO)
+	    != NT_STATUS_OK)
 		goto done;
 
  done:
 	if (got_user_pol) cli_samr_close(pol->cli, pol->mem_ctx, &user_pol);
 
-	return (result == NT_STATUS_NOPROBLEMO);
+	return (result == NT_STATUS_OK);
 }
 
 /****************************************************************************
@@ -314,7 +314,7 @@ BOOL wb_samr_open_user(CLI_POLICY_HND *pol, uint32 access_mask, uint32 rid,
 	ret = cli_samr_open_user(pol->cli, pol->mem_ctx, &pol->handle,
 				 access_mask, rid, user_pol);
 
-	return (ret == NT_STATUS_NOPROBLEMO);
+	return (ret == NT_STATUS_OK);
 }
 
 BOOL wb_samr_query_usergroups(CLI_POLICY_HND *pol, uint32 *num_groups,
@@ -325,7 +325,7 @@ BOOL wb_samr_query_usergroups(CLI_POLICY_HND *pol, uint32 *num_groups,
 	ret = cli_samr_query_usergroups(pol->cli, pol->mem_ctx, &pol->handle,
 					num_groups, gid);
 
-	return (ret == NT_STATUS_NOPROBLEMO);
+	return (ret == NT_STATUS_OK);
 }
 
 BOOL wb_get_samr_query_groupinfo(CLI_POLICY_HND *pol, uint32 info_level,
@@ -338,20 +338,20 @@ BOOL wb_get_samr_query_groupinfo(CLI_POLICY_HND *pol, uint32 info_level,
 	if ((result = cli_samr_open_group(pol->cli, pol->mem_ctx,
 					  &pol->handle, MAXIMUM_ALLOWED_ACCESS,
 					  group_rid, &group_pol))
-	    != NT_STATUS_NOPROBLEMO) 
+	    != NT_STATUS_OK) 
 		goto done;
 
 	got_group_pol = True;
 
 	if ((result = cli_samr_query_groupinfo(pol->cli, pol->mem_ctx,
 					       &group_pol, info_level,
-					       ctr)) != NT_STATUS_NOPROBLEMO)
+					       ctr)) != NT_STATUS_OK)
 		goto done;
 
  done:
 	if (got_group_pol) cli_samr_close(pol->cli, pol->mem_ctx, &group_pol);
 
-	return (result == NT_STATUS_NOPROBLEMO);
+	return (result == NT_STATUS_OK);
 }
 
 BOOL wb_sam_query_groupmem(CLI_POLICY_HND *pol, uint32 group_rid,
@@ -365,7 +365,7 @@ BOOL wb_sam_query_groupmem(CLI_POLICY_HND *pol, uint32 group_rid,
 	if ((result = cli_samr_open_group(pol->cli, pol->mem_ctx,
 					  &pol->handle, MAXIMUM_ALLOWED_ACCESS,
 					  group_rid, &group_pol))
-	    != NT_STATUS_NOPROBLEMO) 
+	    != NT_STATUS_OK) 
 		goto done;
 
 	got_group_pol = True;
@@ -373,7 +373,7 @@ BOOL wb_sam_query_groupmem(CLI_POLICY_HND *pol, uint32 group_rid,
 	if ((result = cli_samr_query_groupmem(pol->cli, pol->mem_ctx,
 					      &group_pol, num_names, rid_mem, 
 					      name_types))
-	    != NT_STATUS_NOPROBLEMO)
+	    != NT_STATUS_OK)
 		goto done;
 
         /* Call cli_samr_lookup_rids() in bunches of ~1000 rids to avoid
@@ -399,7 +399,7 @@ BOOL wb_sam_query_groupmem(CLI_POLICY_HND *pol, uint32 group_rid,
                                               &tmp_num_names,
                                               &tmp_names, &tmp_types);
 
-                if (result != NT_STATUS_NOPROBLEMO)
+                if (result != NT_STATUS_OK)
                         goto done;
 
                 /* Copy result into array.  The talloc system will take
@@ -420,7 +420,7 @@ BOOL wb_sam_query_groupmem(CLI_POLICY_HND *pol, uint32 group_rid,
 	if (got_group_pol) 
                 cli_samr_close(pol->cli, pol->mem_ctx, &group_pol);
 
-	return (result == NT_STATUS_NOPROBLEMO);	
+	return (result == NT_STATUS_OK);	
 }
 
 BOOL wb_samr_query_dom_info(CLI_POLICY_HND *pol, uint16 switch_value,
@@ -431,7 +431,7 @@ BOOL wb_samr_query_dom_info(CLI_POLICY_HND *pol, uint16 switch_value,
 	ret = cli_samr_query_dom_info(pol->cli, pol->mem_ctx, 
 				      &pol->handle, switch_value, ctr);
 
-	return (ret == NT_STATUS_NOPROBLEMO);
+	return (ret == NT_STATUS_OK);
 }
 
 /* Unlike all the others, the status code of this function is actually used
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index 9fc2ee79a0..30b874a820 100644
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -465,7 +465,7 @@ enum winbindd_result winbindd_endgrent(struct winbindd_cli_state *state)
 
 static BOOL get_sam_group_entries(struct getent_state *ent)
 {
-	uint32 status, num_entries, start_ndx = 0;
+	NTSTATUS status, num_entries, start_ndx = 0;
 	struct acct_info *name_list = NULL;
         
 	if (ent->got_all_sam_entries) {
diff --git a/source3/nsswitch/winbindd_misc.c b/source3/nsswitch/winbindd_misc.c
index 21f1afa6a7..b98e89888b 100644
--- a/source3/nsswitch/winbindd_misc.c
+++ b/source3/nsswitch/winbindd_misc.c
@@ -123,7 +123,7 @@ enum winbindd_result winbindd_check_machine_acct(
 	/* Pass back result code - zero for success, other values for
 	   specific failures. */
 
-	DEBUG(3, ("secret is %s\n", (result == NT_STATUS_NOPROBLEMO) ?
+	DEBUG(3, ("secret is %s\n", (result == NT_STATUS_OK) ?
 		  "good" : "bad"));
 
  done:
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index 6f1872e0a4..40762b1f0b 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -135,7 +135,7 @@ enum winbindd_result winbindd_pam_auth(struct winbindd_cli_state *state)
                                         server_state.controller, trust_passwd,
                                         last_change_time);
 
-	return (result == NT_STATUS_NOPROBLEMO) ? WINBINDD_OK : WINBINDD_ERROR;
+	return (result == NT_STATUS_OK) ? WINBINDD_OK : WINBINDD_ERROR;
 }
 
 /* Challenge Response Authentication Protocol */
@@ -206,7 +206,7 @@ enum winbindd_result winbindd_pam_auth_crap(struct winbindd_cli_state *state)
                                         server_state.controller, trust_passwd,
                                         last_change_time);
 
-	return (result == NT_STATUS_NOPROBLEMO) ? WINBINDD_OK : WINBINDD_ERROR;
+	return (result == NT_STATUS_OK) ? WINBINDD_OK : WINBINDD_ERROR;
 }
 
 /* Change a user password */
diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c
index 8bc9ef5a85..6f887e8735 100644
--- a/source3/nsswitch/winbindd_user.c
+++ b/source3/nsswitch/winbindd_user.c
@@ -356,7 +356,7 @@ enum winbindd_result winbindd_endpwent(struct winbindd_cli_state *state)
 
 static BOOL get_sam_user_entries(struct getent_state *ent)
 {
-	uint32 status, num_entries;
+	NTSTATUS status, num_entries;
 	SAM_DISPINFO_1 info1;
 	SAM_DISPINFO_CTR ctr;
 	struct getpwent_user *name_list = NULL;
@@ -614,7 +614,7 @@ enum winbindd_result winbindd_list_users(struct winbindd_cli_state *state)
 	ctr.sam.info1 = &info1;
 
 	for (domain = domain_list; domain; domain = domain->next) {
-		uint32 status, start_ndx = 0;
+		NTSTATUS status, start_ndx = 0;
 
 		/* Skip domains other than WINBINDD_DOMAIN environment
 		   variable */ 
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 75ddb6bc09..e24e15429f 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -594,7 +594,7 @@ BOOL winbindd_lookup_usergroups(struct winbindd_domain *domain,
 	if (cli_samr_query_usergroups(domain->sam_dom_handle.cli,
 				      domain->sam_dom_handle.mem_ctx,
 				      &user_pol, num_groups, user_groups)
-	    != NT_STATUS_NOPROBLEMO) {
+	    != NT_STATUS_OK) {
 		result = False;
 		goto done;
 	}
@@ -871,7 +871,7 @@ uint32 winbindd_query_dispinfo(struct winbindd_domain *domain,
 			     uint32 *start_ndx, uint16 info_level, 
 			     uint32 *num_entries, SAM_DISPINFO_CTR *ctr)
 {
-	uint32 status;
+	NTSTATUS status;
 
 	status = wb_samr_query_dispinfo(&domain->sam_dom_handle, start_ndx,
 					info_level, num_entries, ctr);