Renamed get_nt_error_msg() to nt_errstr().

(This used to be commit 1f007d3ed41c1b71a89fa6be7d173e67e927c302)

7 files changed, 51 insertions, 51 deletions

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 5b59e5b543..90c8a34c21 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -91,7 +91,7 @@ BOOL cli_net_logon_ctrl2(struct cli_state *cli, NTSTATUS status_level)
     if (ok && r_l.status != 0)
     {
       /* report error code */
-      DEBUG(0,("do_net_logon_ctrl2: Error %s\n", get_nt_error_msg(r_l.status)));
+      DEBUG(0,("do_net_logon_ctrl2: Error %s\n", nt_errstr(r_l.status)));
       cli->nt_error = r_l.status;
       ok = False;
     }
@@ -153,7 +153,7 @@ NTSTATUS cli_net_auth2(struct cli_state *cli, uint16 sec_chan,
     if (ok && !NT_STATUS_IS_OK(result))
     {
       /* report error code */
-      DEBUG(0,("cli_net_auth2: Error %s\n", get_nt_error_msg(result)));
+      DEBUG(0,("cli_net_auth2: Error %s\n", nt_errstr(result)));
       ok = False;
     }
 
@@ -242,7 +242,7 @@ BOOL cli_net_req_chal(struct cli_state *cli, DOM_CHAL *clnt_chal, DOM_CHAL *srv_
     if (ok && !NT_STATUS_IS_OK(r_c.status))
     {
       /* report error code */
-      DEBUG(0,("cli_net_req_chal: Error %s\n", get_nt_error_msg(r_c.status)));
+      DEBUG(0,("cli_net_req_chal: Error %s\n", nt_errstr(r_c.status)));
       ok = False;
     }
 
@@ -332,7 +332,7 @@ static NTSTATUS cli_net_sam_logon_internal(struct cli_state *cli, NET_ID_INFO_CT
 
 	if (!NT_STATUS_IS_OK(retval)) {
 		/* report error code */
-		DEBUG(0,("cli_net_sam_logon_internal: %s\n", get_nt_error_msg(r_s.status)));
+		DEBUG(0,("cli_net_sam_logon_internal: %s\n", nt_errstr(r_s.status)));
 		goto out;
 	}
 
@@ -447,7 +447,7 @@ BOOL cli_net_sam_logoff(struct cli_state *cli, NET_ID_INFO_CTR *ctr)
     if (ok && !NT_STATUS_IS_OK(r_s.status))
     {
       /* report error code */
-      DEBUG(0,("cli_net_sam_logoff: %s\n", get_nt_error_msg(r_s.status)));
+      DEBUG(0,("cli_net_sam_logoff: %s\n", nt_errstr(r_s.status)));
       ok = False;
     }
 
diff --git a/source3/rpc_client/cli_reg.c b/source3/rpc_client/cli_reg.c
index 64fd908314..628cd576a8 100644
--- a/source3/rpc_client/cli_reg.c
+++ b/source3/rpc_client/cli_reg.c
@@ -112,7 +112,7 @@ BOOL do_reg_open_hklm(struct cli_state *cli, uint16 unknown_0, uint32 level,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_OPEN_HKLM: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_OPEN_HKLM: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -173,7 +173,7 @@ BOOL do_reg_open_hku(struct cli_state *cli, uint16 unknown_0, uint32 level,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_OPEN_HKU: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_OPEN_HKU: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -235,7 +235,7 @@ BOOL do_reg_flush_key(struct cli_state *cli, POLICY_HND *hnd)
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_FLUSH_KEY: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_FLUSH_KEY: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -297,7 +297,7 @@ BOOL do_reg_query_key(struct cli_state *cli, POLICY_HND *hnd,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_QUERY_KEY: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_QUERY_KEY: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -365,7 +365,7 @@ BOOL do_reg_unknown_1a(struct cli_state *cli, POLICY_HND *hnd, uint32 *unk)
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_UNK_1A: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_UNK_1A: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -425,7 +425,7 @@ BOOL do_reg_query_info(struct cli_state *cli, POLICY_HND *hnd,
 
 	if ( r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_INFO: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_INFO: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -548,7 +548,7 @@ BOOL do_reg_get_key_sec(struct cli_state *cli, POLICY_HND *hnd, uint32 *sec_buf_
 		DEBUG(5,("sec_buf_size too small.  use %d\n", *sec_buf_size));
 	} else if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_GET_KEY_SEC: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_GET_KEY_SEC: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	} else {
@@ -608,7 +608,7 @@ BOOL do_reg_delete_val(struct cli_state *cli, POLICY_HND *hnd, char *val_name)
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_DELETE_VALUE: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_DELETE_VALUE: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -665,7 +665,7 @@ BOOL do_reg_delete_key(struct cli_state *cli, POLICY_HND *hnd, char *key_name)
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_DELETE_KEY: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_DELETE_KEY: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -743,7 +743,7 @@ BOOL do_reg_create_key(struct cli_state *cli, POLICY_HND *hnd,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_CREATE_KEY: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_CREATE_KEY: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -805,7 +805,7 @@ BOOL do_reg_enum_key(struct cli_state *cli, POLICY_HND *hnd,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_ENUM_KEY: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_ENUM_KEY: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -868,7 +868,7 @@ BOOL do_reg_create_val(struct cli_state *cli, POLICY_HND *hnd,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_CREATE_VALUE: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_CREATE_VALUE: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -929,7 +929,7 @@ BOOL do_reg_enum_val(struct cli_state *cli, POLICY_HND *hnd,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_ENUM_VALUE: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_ENUM_VALUE: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -991,7 +991,7 @@ BOOL do_reg_open_entry(struct cli_state *cli, POLICY_HND *hnd,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_OPEN_ENTRY: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("REG_OPEN_ENTRY: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
@@ -1051,7 +1051,7 @@ BOOL do_reg_close(struct cli_state *cli, POLICY_HND *hnd)
 
 	if (r_c.status != 0) {
 		/* report error code */
-		DEBUG(0,("REG_CLOSE: %s\n", get_nt_error_msg(r_c.status)));
+		DEBUG(0,("REG_CLOSE: %s\n", nt_errstr(r_c.status)));
 		prs_mem_free(&rbuf);
 		return False;
 	}
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 7b47cf425d..6467ae4fa9 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -140,7 +140,7 @@ BOOL do_samr_chgpasswd_user(struct cli_state *cli,
 
 	if (r_e.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_R_CHGPASSWD_USER: %s\n", get_nt_error_msg(r_e.status)));
+		DEBUG(0,("SAMR_R_CHGPASSWD_USER: %s\n", nt_errstr(r_e.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -197,7 +197,7 @@ BOOL do_samr_unknown_38(struct cli_state *cli, char *srv_name)
 
 	if (r_e.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_R_UNKNOWN_38: %s\n", get_nt_error_msg(r_e.status)));
+		DEBUG(0,("SAMR_R_UNKNOWN_38: %s\n", nt_errstr(r_e.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -255,7 +255,7 @@ BOOL do_samr_query_dom_info(struct cli_state *cli,
 
 	if (r_e.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_R_QUERY_DOMAIN_INFO: %s\n", get_nt_error_msg(r_e.status)));
+		DEBUG(0,("SAMR_R_QUERY_DOMAIN_INFO: %s\n", nt_errstr(r_e.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -323,7 +323,7 @@ BOOL do_samr_enum_dom_users(struct cli_state *cli,
 
 	if (r_e.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_R_ENUM_DOM_USERS: %s\n", get_nt_error_msg(r_e.status)));
+		DEBUG(0,("SAMR_R_ENUM_DOM_USERS: %s\n", nt_errstr(r_e.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -410,7 +410,7 @@ BOOL do_samr_connect(struct cli_state *cli,
 		
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_R_CONNECT: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("SAMR_R_CONNECT: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -471,7 +471,7 @@ BOOL do_samr_open_user(struct cli_state *cli,
 		
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_R_OPEN_USER: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("SAMR_R_OPEN_USER: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -533,7 +533,7 @@ BOOL do_samr_open_domain(struct cli_state *cli,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_R_OPEN_DOMAIN: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("SAMR_R_OPEN_DOMAIN: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -600,7 +600,7 @@ BOOL do_samr_query_unknown_12(struct cli_state *cli,
 		
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_R_UNKNOWN_12: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("SAMR_R_UNKNOWN_12: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -681,7 +681,7 @@ BOOL do_samr_query_usergroups(struct cli_state *cli,
 		
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_R_QUERY_USERGROUPS: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("SAMR_R_QUERY_USERGROUPS: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -747,7 +747,7 @@ BOOL do_samr_query_userinfo(struct cli_state *cli,
 		
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_R_QUERY_USERINFO: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("SAMR_R_QUERY_USERINFO: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -817,7 +817,7 @@ BOOL do_samr_close(struct cli_state *cli, POLICY_HND *hnd)
 
 	if (r_c.status != 0) {
 		/* report error code */
-		DEBUG(0,("SAMR_CLOSE_HND: %s\n", get_nt_error_msg(r_c.status)));
+		DEBUG(0,("SAMR_CLOSE_HND: %s\n", nt_errstr(r_c.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index 55becc1982..ca01808f59 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -69,7 +69,7 @@ uint32 spoolss_enum_printerdrivers(const char *srv_name, const char *environment
 		{
 			if (r_o.status != NT_STATUS_OK)
 			{
-				DEBUG(3,("SPOOLSS_ENUMPRINTERDRIVERS:  %s\n", get_nt_error_msg(r_o.status)));
+				DEBUG(3,("SPOOLSS_ENUMPRINTERDRIVERS:  %s\n", nt_errstr(r_o.status)));
 			}
 		        *needed=r_o.needed;
 		        *returned=r_o.returned;
@@ -126,7 +126,7 @@ uint32 spoolss_enum_printers(uint32 flags, fstring srv_name, uint32 level,
 			if (r_o.status != NT_STATUS_OK)
 			{
                         	/* report error code */
-                        	DEBUG(3,("SPOOLSS_ENUMPRINTERS: %s\n", get_nt_error_msg(r_o.status)));
+                        	DEBUG(3,("SPOOLSS_ENUMPRINTERS: %s\n", nt_errstr(r_o.status)));
 			}
 
         		*needed=r_o.needed;
@@ -185,7 +185,7 @@ uint32 spoolss_enum_ports(fstring srv_name, uint32 level,
 		{
 			if (r_o.status != NT_STATUS_OK)
 			{
-				DEBUG(3,("SPOOLSS_ENUMPORTS: %s\n", get_nt_error_msg(r_o.status)));
+				DEBUG(3,("SPOOLSS_ENUMPORTS: %s\n", nt_errstr(r_o.status)));
 			}
 			
 	        	*needed=r_o.needed;
@@ -239,7 +239,7 @@ uint32 spoolss_enum_jobs(const POLICY_HND *hnd, uint32 firstjob, uint32 numofjob
 		{
 			if (r_o.status != NT_STATUS_OK)
 			{
-				DEBUG(3,("SPOOLSS_ENUMJOBS: %s\n", get_nt_error_msg(r_o.status)));
+				DEBUG(3,("SPOOLSS_ENUMJOBS: %s\n", nt_errstr(r_o.status)));
 			}
 	        	*needed=r_o.needed;
 		        *returned=r_o.returned;
@@ -297,7 +297,7 @@ uint32 spoolss_enum_printerdata(const POLICY_HND *hnd, uint32 idx,
 		{
 			if (r_o.status != NT_STATUS_OK)
 			{
-				DEBUG(3,("SPOOLSS_ENUMPRINTERDATA: %s\n", get_nt_error_msg(r_o.status)));
+				DEBUG(3,("SPOOLSS_ENUMPRINTERDATA: %s\n", nt_errstr(r_o.status)));
 			}
 			
 			*valuelen=r_o.valuesize;
@@ -357,7 +357,7 @@ uint32 spoolss_getprinter(const POLICY_HND *hnd, uint32 level,
 		{
 			if (r_o.status != NT_STATUS_OK)
 			{
-				DEBUG(3,("SPOOLSS_GETPRINTER: %s\n", get_nt_error_msg(r_o.status)));
+				DEBUG(3,("SPOOLSS_GETPRINTER: %s\n", nt_errstr(r_o.status)));
 			}
 		        *needed=r_o.needed;
 		}
@@ -410,7 +410,7 @@ uint32 spoolss_getprinterdriver(const POLICY_HND *hnd,
 		{
 			if (r_o.status != NT_STATUS_OK)
 			{
-				DEBUG(3,("SPOOLSS_GETPRINTERDRIVER2: %s\n", get_nt_error_msg(r_o.status)));
+				DEBUG(3,("SPOOLSS_GETPRINTERDRIVER2: %s\n", nt_errstr(r_o.status)));
 			}
 
 		        *needed=r_o.needed;
@@ -482,7 +482,7 @@ BOOL spoolss_open_printer_ex(  const char *printername,
                 if (prs_offset(&rbuf)!= 0 && r_o.status != 0)
                 {
                         /* report error code */
-                        DEBUG(3,("SPOOLSS_OPENPRINTEREX: %s\n", get_nt_error_msg(r_o.status)));
+                        DEBUG(3,("SPOOLSS_OPENPRINTEREX: %s\n", nt_errstr(r_o.status)));
                         p = False;
                 }
 
@@ -561,7 +561,7 @@ BOOL spoolss_addprinterex(POLICY_HND *hnd, const char* srv_name, PRINTER_INFO_2
 			if (r_o.status != NT_STATUS_OK)
                         {
 				/* report error code */
-                        	DEBUG(3,("SPOOLSS_ADDPRINTEREX: %s\n", get_nt_error_msg(r_o.status)));
+                        	DEBUG(3,("SPOOLSS_ADDPRINTEREX: %s\n", nt_errstr(r_o.status)));
                         	valid_pol = False;
 			}
         	}
@@ -626,7 +626,7 @@ BOOL spoolss_closeprinter(POLICY_HND *hnd)
                 if (prs_offset(&rbuf)!=0 && r_c.status != 0)
                 {
                         /* report error code */
-                        DEBUG(3,("SPOOL_CLOSEPRINTER: %s\n", get_nt_error_msg(r_c.status)));
+                        DEBUG(3,("SPOOL_CLOSEPRINTER: %s\n", nt_errstr(r_c.status)));
                 }
 		else
 			valid_close = True;
@@ -689,7 +689,7 @@ uint32 spoolss_getprinterdata(const POLICY_HND *hnd, const UNISTR2 *valuename,
 		{
 			if (r_o.status != NT_STATUS_OK)
 			{
-				DEBUG(3,("SPOOLSS_GETPRINTERDATA: %s\n", get_nt_error_msg(r_o.status)));
+				DEBUG(3,("SPOOLSS_GETPRINTERDATA: %s\n", nt_errstr(r_o.status)));
 			}
 
 		        *type=r_o.type;
@@ -748,7 +748,7 @@ uint32 spoolss_getprinterdriverdir(fstring srv_name, fstring env_name, uint32 le
 		{
 			if (r_o.status != NT_STATUS_OK)
 			{
-				DEBUG(3,("SPOOLSS_GETPRINTERDRIVERDIRECTORY: %s\n", get_nt_error_msg(r_o.status)));
+				DEBUG(3,("SPOOLSS_GETPRINTERDRIVERDIRECTORY: %s\n", nt_errstr(r_o.status)));
 			}
 
 		        *needed=r_o.needed;
@@ -800,7 +800,7 @@ uint32 spoolss_addprinterdriver(const char *srv_name, uint32 level, PRINTER_DRIV
 			if (r_o.status != NT_STATUS_OK)
 			{
                         	/* report error code */
-                        	DEBUG(3,("SPOOLSS_ADDPRINTERDRIVER: %s\n", get_nt_error_msg(r_o.status)));
+                        	DEBUG(3,("SPOOLSS_ADDPRINTERDRIVER: %s\n", nt_errstr(r_o.status)));
 			}
 		}
         }
diff --git a/source3/rpc_client/cli_srvsvc.c b/source3/rpc_client/cli_srvsvc.c
index 641fb4250d..024e711789 100644
--- a/source3/rpc_client/cli_srvsvc.c
+++ b/source3/rpc_client/cli_srvsvc.c
@@ -84,7 +84,7 @@ BOOL do_srv_net_srv_conn_enum(struct cli_state *cli,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("SRV_R_NET_SRV_CONN_ENUM: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("SRV_R_NET_SRV_CONN_ENUM: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -164,7 +164,7 @@ BOOL do_srv_net_srv_sess_enum(struct cli_state *cli,
 		
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("SRV_R_NET_SRV_SESS_ENUM: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("SRV_R_NET_SRV_SESS_ENUM: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -232,7 +232,7 @@ BOOL do_srv_net_srv_share_enum(struct cli_state *cli,
 		
 	if (r_o->status != 0) {
 		/* report error code */
-		DEBUG(0,("SRV_R_NET_SHARE_ENUM: %s\n", get_nt_error_msg(r_o->status)));
+		DEBUG(0,("SRV_R_NET_SHARE_ENUM: %s\n", nt_errstr(r_o->status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -314,7 +314,7 @@ BOOL do_srv_net_srv_file_enum(struct cli_state *cli,
 		
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("SRV_R_NET_FILE_ENUM: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("SRV_R_NET_FILE_ENUM: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
@@ -381,7 +381,7 @@ BOOL do_srv_net_srv_get_info(struct cli_state *cli,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		DEBUG(0,("SRV_R_NET_SRV_GET_INFO: %s\n", get_nt_error_msg(r_o.status)));
+		DEBUG(0,("SRV_R_NET_SRV_GET_INFO: %s\n", nt_errstr(r_o.status)));
 		prs_mem_free(&rdata);
 		return False;
 	}
diff --git a/source3/rpc_client/cli_wkssvc.c b/source3/rpc_client/cli_wkssvc.c
index 0dd5ba5bcd..788d60c56e 100644
--- a/source3/rpc_client/cli_wkssvc.c
+++ b/source3/rpc_client/cli_wkssvc.c
@@ -73,7 +73,7 @@ BOOL do_wks_query_info(struct cli_state *cli,
 
 	if (r_o.status != 0) {
 		/* report error code */
-		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 False;
 	}
diff --git a/source3/rpc_client/msrpc_spoolss.c b/source3/rpc_client/msrpc_spoolss.c
index 02a5694e8b..2267190d8e 100644
--- a/source3/rpc_client/msrpc_spoolss.c
+++ b/source3/rpc_client/msrpc_spoolss.c
@@ -249,7 +249,7 @@ BOOL msrpc_spoolss_enum_printers(char* srv_name, uint32 flags,
 	
 	if (status!=NT_STATUS_OK)
 	{
-		DEBUG(0,("spoolss_enum_printers: %s\n", get_nt_error_msg(status)));
+		DEBUG(0,("spoolss_enum_printers: %s\n", nt_errstr(status)));
 		if (mem_ctx)
 			talloc_destroy(mem_ctx);
 		return False;