From ab13654dc9ac23872e4d1384e1c54e336f113009 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 17 Mar 2002 04:36:35 +0000
Subject: Renamed get_nt_error_msg() to nt_errstr(). (This used to be commit
 1f007d3ed41c1b71a89fa6be7d173e67e927c302)

---
 source3/libsmb/cli_lsarpc.c   | 4 ++--
 source3/libsmb/cli_netlogon.c | 4 ++--
 source3/libsmb/cli_wkssvc.c   | 2 +-
 source3/libsmb/clierror.c     | 2 +-
 source3/libsmb/libsmbclient.c | 2 +-
 source3/libsmb/nterr.c        | 2 +-
 source3/libsmb/trust_passwd.c | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source3/libsmb')

diff --git a/source3/libsmb/cli_lsarpc.c b/source3/libsmb/cli_lsarpc.c
index 249225d894..90b1cc8d69 100644
--- a/source3/libsmb/cli_lsarpc.c
+++ b/source3/libsmb/cli_lsarpc.c
@@ -1131,14 +1131,14 @@ Error was : %s.\n", remote_machine, cli_errstr(&cli) ));
 	result = cli_lsa_open_policy(&cli, cli.mem_ctx, True, SEC_RIGHTS_QUERY_VALUE, &lsa_pol);
 	if (!NT_STATUS_IS_OK(result)) {
 		DEBUG(0, ("fetch_domain_sid: Error opening lsa policy handle. %s\n",
-			get_nt_error_msg(result) ));
+			nt_errstr(result) ));
 		goto done;
 	}
  
 	result = cli_lsa_query_info_policy(&cli, cli.mem_ctx, &lsa_pol, 5, domain, psid);
 	if (!NT_STATUS_IS_OK(result)) {
 		DEBUG(0, ("fetch_domain_sid: Error querying lsa policy handle. %s\n",
-			get_nt_error_msg(result) ));
+			nt_errstr(result) ));
 		goto done;
 	}
  
diff --git a/source3/libsmb/cli_netlogon.c b/source3/libsmb/cli_netlogon.c
index 590f5f525e..125590b6d3 100644
--- a/source3/libsmb/cli_netlogon.c
+++ b/source3/libsmb/cli_netlogon.c
@@ -207,7 +207,7 @@ NTSTATUS new_cli_nt_setup_creds(struct cli_state *cli,
 				   &srv_chal);
 	if (!NT_STATUS_IS_OK(result)) {
                 DEBUG(0,("cli_nt_setup_creds: auth2 challenge failed %s\n",
-			 get_nt_error_msg(result)));
+			 nt_errstr(result)));
         }
 
         return result;
@@ -648,7 +648,7 @@ NTSTATUS cli_net_srv_pwset(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 		if (!NT_STATUS_IS_OK(r_s.status))
 		{
 			/* report error code */
-			DEBUG(0,("cli_net_srv_pwset: %s\n", get_nt_error_msg(nt_status)));
+			DEBUG(0,("cli_net_srv_pwset: %s\n", nt_errstr(nt_status)));
 			goto done;
 		}
 
diff --git a/source3/libsmb/cli_wkssvc.c b/source3/libsmb/cli_wkssvc.c
index 391aee1782..2a84e6b698 100644
--- a/source3/libsmb/cli_wkssvc.c
+++ b/source3/libsmb/cli_wkssvc.c
@@ -99,7 +99,7 @@ NTSTATUS cli_wks_query_info(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	/* check returnet status code */
 	if (NT_STATUS_IS_ERR(r_o.status)) {
 		/* report the error */
-		DEBUG(0,("WKS_R_QUERY_INFO: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("WKS_R_QUERY_INFO: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return r_o.status;
 	}
diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index 13ea6b1997..591c04db22 100644
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -103,7 +103,7 @@ char *cli_errstr(struct cli_state *cli)
 	if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) {
 		NTSTATUS status = NT_STATUS(IVAL(cli->inbuf,smb_rcls));
 
-		return get_nt_error_msg(status);
+		return nt_errstr(status);
         }
 
 	cli_dos_error(cli, &errclass, &errnum);
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index eb2b7ae25b..237701b968 100644
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -216,7 +216,7 @@ int smbc_errno(struct cli_state *c)
                 ret = cli_errno_from_nt(status);
 
                 DEBUG(3,("smbc errno %s -> %d\n",
-                         get_nt_error_msg(status), ret));
+                         nt_errstr(status), ret));
         }
 
 	return ret;
diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c
index 4d13caba91..b74dde9b14 100644
--- a/source3/libsmb/nterr.c
+++ b/source3/libsmb/nterr.c
@@ -540,7 +540,7 @@ nt_err_code_struct nt_errs[] =
 /*****************************************************************************
  returns an NT error message.  not amazingly helpful, but better than a number.
  *****************************************************************************/
-char *get_nt_error_msg(NTSTATUS nt_code)
+char *nt_errstr(NTSTATUS nt_code)
 {
         static pstring msg;
         int idx = 0;
diff --git a/source3/libsmb/trust_passwd.c b/source3/libsmb/trust_passwd.c
index 1f52ab3611..51ffa1dd95 100644
--- a/source3/libsmb/trust_passwd.c
+++ b/source3/libsmb/trust_passwd.c
@@ -40,7 +40,7 @@ static NTSTATUS just_change_the_password(struct cli_state *cli, TALLOC_CTX *mem_
 	
 	if (!NT_STATUS_IS_OK(result)) {
 		DEBUG(0,("just_change_the_password: unable to setup creds (%s)!\n",
-			 get_nt_error_msg(result)));
+			 nt_errstr(result)));
 		return result;
 	}
 
@@ -48,7 +48,7 @@ static NTSTATUS just_change_the_password(struct cli_state *cli, TALLOC_CTX *mem_
 
 	if (!NT_STATUS_IS_OK(result)) {
 		DEBUG(0,("just_change_the_password: unable to change password (%s)!\n",
-			 get_nt_error_msg(result)));
+			 nt_errstr(result)));
 	}
 	return result;
 }
-- 
cgit