ndr: merge duplicate ndr_map_error2ntstatus() functions.

Guenther

3 files changed, 25 insertions, 51 deletions

diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index d628faaa9a..1d67e11e9d 100644
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -1213,3 +1213,28 @@ _PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool
 {
 	ndr->print(ndr, "%-25s: %s", name, b?"true":"false");
 }
+
+_PUBLIC_ NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err)
+{
+	switch (ndr_err) {
+	case NDR_ERR_SUCCESS:
+		return NT_STATUS_OK;
+	case NDR_ERR_BUFSIZE:
+		return NT_STATUS_BUFFER_TOO_SMALL;
+	case NDR_ERR_TOKEN:
+		return NT_STATUS_INTERNAL_ERROR;
+	case NDR_ERR_ALLOC:
+		return NT_STATUS_NO_MEMORY;
+	case NDR_ERR_ARRAY_SIZE:
+		return NT_STATUS_ARRAY_BOUNDS_EXCEEDED;
+	case NDR_ERR_INVALID_POINTER:
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	case NDR_ERR_UNREAD_BYTES:
+		return NT_STATUS_PORT_MESSAGE_TOO_LONG;
+	default:
+		break;
+	}
+
+	/* we should map all error codes to different status codes */
+	return NT_STATUS_INVALID_PARAMETER;
+}
diff --git a/source3/librpc/ndr/util.c b/source3/librpc/ndr/util.c
index ed24f87387..ada98108e5 100644
--- a/source3/librpc/ndr/util.c
+++ b/source3/librpc/ndr/util.c
@@ -21,31 +21,6 @@
 
 #include "includes.h"
 
-NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err)
-{
-	switch (ndr_err) {
-	case NDR_ERR_SUCCESS:
-		return NT_STATUS_OK;
-	case NDR_ERR_BUFSIZE:
-		return NT_STATUS_BUFFER_TOO_SMALL;
-	case NDR_ERR_TOKEN:
-		return NT_STATUS_INTERNAL_ERROR;
-	case NDR_ERR_ALLOC:
-		return NT_STATUS_NO_MEMORY;
-	case NDR_ERR_ARRAY_SIZE:
-		return NT_STATUS_ARRAY_BOUNDS_EXCEEDED;
-	case NDR_ERR_INVALID_POINTER:
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	case NDR_ERR_UNREAD_BYTES:
-		return NT_STATUS_PORT_MESSAGE_TOO_LONG;
-	default:
-		break;
-	}
-
-	/* we should map all error codes to different status codes */
-	return NT_STATUS_INVALID_PARAMETER;
-}
-
 /*
  * Convert an ndr error to string
  */
diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c
index 29f2331cde..a0154e370b 100644
--- a/source4/libcli/util/errormap.c
+++ b/source4/libcli/util/errormap.c
@@ -20,7 +20,6 @@
  */
 
 #include "includes.h"
-#include "librpc/ndr/libndr.h"
 
 /* This map was extracted by the ERRMAPEXTRACT smbtorture command. 
    The setup was a Samba HEAD (2002-01-03) PDC and an Win2k member 
@@ -1388,28 +1387,3 @@ WERROR unix_to_werror(int unix_error)
 {
 	return ntstatus_to_werror(map_nt_error_from_unix(unix_error));
 }
-
-NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err)
-{
-	switch (ndr_err) {
-	case NDR_ERR_SUCCESS:
-		return NT_STATUS_OK;
-	case NDR_ERR_BUFSIZE:
-		return NT_STATUS_BUFFER_TOO_SMALL;
-	case NDR_ERR_TOKEN:
-		return NT_STATUS_INTERNAL_ERROR;
-	case NDR_ERR_ALLOC:
-		return NT_STATUS_NO_MEMORY;
-	case NDR_ERR_ARRAY_SIZE:
-		return NT_STATUS_ARRAY_BOUNDS_EXCEEDED;
-	case NDR_ERR_INVALID_POINTER:
-		return NT_STATUS_INVALID_PARAMETER_MIX;
-	case NDR_ERR_UNREAD_BYTES:
-		return NT_STATUS_PORT_MESSAGE_TOO_LONG;
-	default:
-		break;
-	}
-
-	/* we should map all error codes to different status codes */
-	return NT_STATUS_INVALID_PARAMETER;
-}