From 44b728958ae9a48bb56591532e5db9867311c1b9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 23 Oct 2008 15:35:21 +0200
Subject: Use common error definitions.

---
 source3/libsmb/doserr.c | 2 +-
 source3/libsmb/nterr.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/libsmb')

diff --git a/source3/libsmb/doserr.c b/source3/libsmb/doserr.c
index 2716e04d91..d14733a534 100644
--- a/source3/libsmb/doserr.c
+++ b/source3/libsmb/doserr.c
@@ -81,7 +81,7 @@ werror_code_struct dos_errs[] =
 	{ "WERR_DFS_NO_SUCH_SERVER", WERR_DFS_NO_SUCH_SERVER },
 	{ "WERR_DFS_INTERNAL_ERROR", WERR_DFS_INTERNAL_ERROR },
 	{ "WERR_DFS_CANT_CREATE_JUNCT", WERR_DFS_CANT_CREATE_JUNCT },
-	{ "WERR_INVALID_COMPUTER_NAME", WERR_INVALID_COMPUTER_NAME },
+	{ "WERR_INVALID_COMPUTERNAME", WERR_INVALID_COMPUTERNAME },
 	{ "WERR_INVALID_DOMAINNAME", WERR_INVALID_DOMAINNAME },
 	{ "WERR_MACHINE_LOCKED", WERR_MACHINE_LOCKED },
 	{ "WERR_DC_NOT_FOUND", WERR_DC_NOT_FOUND },
diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c
index fc6340342f..1ba230cefe 100644
--- a/source3/libsmb/nterr.c
+++ b/source3/libsmb/nterr.c
@@ -653,7 +653,7 @@ const char *nt_errstr(NTSTATUS nt_code)
 	char *result;
 
 #ifdef HAVE_LDAP
-        if (NT_STATUS_TYPE(nt_code) == NT_STATUS_TYPE_LDAP) {
+        if (NT_STATUS_IS_LDAP(nt_code)) {
                 return ldap_err2string(NT_STATUS_LDAP_CODE(nt_code));
 	}
 #endif
@@ -718,7 +718,7 @@ const char *get_nt_error_c_code(NTSTATUS nt_code)
  Returns the NT_STATUS constant matching the string supplied (as an NTSTATUS)
  *****************************************************************************/
 
-NTSTATUS nt_status_string_to_code(char *nt_status_str)
+NTSTATUS nt_status_string_to_code(const char *nt_status_str)
 {
         int idx = 0;
 
-- 
cgit