Renamed get_nt_error_msg() to nt_errstr().

(This used to be commit 1f007d3ed41c1b71a89fa6be7d173e67e927c302)

3 files changed, 13 insertions, 13 deletions

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 109807851a..376b3ddbfd 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -147,7 +147,7 @@ NTSTATUS connect_to_ipc(struct cli_state **c, struct in_addr *server_ip,
 		return nt_status;
 	} else {
 		DEBUG(0,("Cannot connect to server.  Error was %s\n", 
-			 get_nt_error_msg(nt_status)));
+			 nt_errstr(nt_status)));
 
 		/* Display a nicer message depending on the result */
 
@@ -176,7 +176,7 @@ NTSTATUS connect_to_ipc_anonymous(struct cli_state **c,
 	if (NT_STATUS_IS_OK(nt_status)) {
 		return nt_status;
 	} else {
-		DEBUG(0,("Cannot connect to server (anonymously).  Error was %s\n", get_nt_error_msg(nt_status)));
+		DEBUG(0,("Cannot connect to server (anonymously).  Error was %s\n", nt_errstr(nt_status)));
 		return nt_status;
 	}
 }
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index dd8848bb73..6200d6f914 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -96,7 +96,7 @@ static DOM_SID *net_get_remote_domain_sid(struct cli_state *cli)
 	fprintf(stderr, "could not obtain sid for domain %s\n", cli->domain);
 
 	if (!NT_STATUS_IS_OK(result)) {
-		fprintf(stderr, "error: %s\n", get_nt_error_msg(result));
+		fprintf(stderr, "error: %s\n", nt_errstr(result));
 	}
 
 	exit(1);
@@ -144,7 +144,7 @@ static int run_rpc_command(const char *pipe_name, int conn_flags,
 	nt_status = fn(domain_sid, cli, mem_ctx, argc, argv);
 	
 	if (!NT_STATUS_IS_OK(nt_status)) {
-		DEBUG(0, ("rpc command function failed! (%s)\n", get_nt_error_msg(nt_status)));
+		DEBUG(0, ("rpc command function failed! (%s)\n", nt_errstr(nt_status)));
 	} else {
 		DEBUG(5, ("rpc command function succedded\n"));
 	}
@@ -361,7 +361,7 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid, struct cli_sta
  done:
 	if (!NT_STATUS_IS_OK(result)) {
 		d_printf("Failed to add user %s - %s\n", acct_name, 
-			 get_nt_error_msg(result));
+			 nt_errstr(result));
 	} else {
 		d_printf("Added user %s\n", acct_name);
 	}
@@ -724,7 +724,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) {
 
 		/* Is it trusting domain account for sure ? */
 		DEBUG(0, ("Couldn't verify trusting domain account. Error was %s\n",
-			get_nt_error_msg(nt_status)));
+			nt_errstr(nt_status)));
 		return -1;
 	}
 	
@@ -736,7 +736,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) {
 	
 	if (NT_STATUS_IS_ERR(nt_status)) {
 		DEBUG(0, ("Couldn't connect to domain %s controller. Error was %s.\n",
-			domain_name, get_nt_error_msg(nt_status)));
+			domain_name, nt_errstr(nt_status)));
 	}
 
 	/*
@@ -803,7 +803,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) {
 					&connect_hnd);
 	if (NT_STATUS_IS_ERR(nt_status)) {
 		DEBUG(0, ("Couldn't open policy handle. Error was %s\n",
-			get_nt_error_msg(nt_status)));
+			nt_errstr(nt_status)));
 		return -1;
 	}
 
@@ -813,7 +813,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) {
 					5 /* info level */, domain_name, &domain_sid);
 	if (NT_STATUS_IS_ERR(nt_status)) {
 		DEBUG(0, ("LSA Query Info failed. Returned error was %s\n",
-			get_nt_error_msg(nt_status)));
+			nt_errstr(nt_status)));
 		return -1;
 	}
 
@@ -828,7 +828,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) {
 	nt_status = cli_lsa_close(cli, mem_ctx, &connect_hnd);
 	if (NT_STATUS_IS_ERR(nt_status)) {
 		DEBUG(0, ("Couldn't close LSA pipe. Error was %s\n",
-			get_nt_error_msg(nt_status)));
+			nt_errstr(nt_status)));
 		return -1;
 	}
 
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index a88292492a..a2c0614a50 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -25,7 +25,7 @@
 
 #define CHECK_RPC_ERR(rpc, msg) \
         if (!NT_STATUS_IS_OK(result = rpc)) { \
-                DEBUG(0, (msg ": %s\n", get_nt_error_msg(result))); \
+                DEBUG(0, (msg ": %s\n", nt_errstr(result))); \
                 goto done; \
         }
 
@@ -169,7 +169,7 @@ int net_rpc_join_newstyle(int argc, const char **argv)
 						  1, &names, &num_rids,
 						  &user_rids, &name_types),
 			    ("error looking up rid for user %s: %s\n",
-			     acct_name, get_nt_error_msg(result)));
+			     acct_name, nt_errstr(result)));
 
 	if (name_types[0] != SID_NAME_USER) {
 		DEBUG(0, ("%s is not a user account\n", acct_name));
@@ -185,7 +185,7 @@ int net_rpc_join_newstyle(int argc, const char **argv)
 				   SEC_RIGHTS_MAXIMUM_ALLOWED,
 				   user_rid, &user_pol),
 		("could not re-open existing user %s: %s\n",
-		 acct_name, get_nt_error_msg(result)));
+		 acct_name, nt_errstr(result)));
 	
 	/* Create a random machine account password */