werror: removed WERR_NOMEM

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index f26ab86252886ce228b06a82295b1559decf4f8f..e6075fe0892f11eea74b530dc6b0cfb01f8d979e 100644 (file)
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -40,7 +40,6 @@ static const struct werror_code_struct dos_errs[] =
        { "WERR_INVALID_PARAM", WERR_INVALID_PARAM },
        { "WERR_NOT_SUPPORTED", WERR_NOT_SUPPORTED },
        { "WERR_DUP_NAME", WERR_DUP_NAME },
-       { "WERR_NOMEM", WERR_NOMEM },
        { "WERR_INVALID_NAME", WERR_INVALID_NAME },
        { "WERR_OBJECT_PATH_INVALID", WERR_OBJECT_PATH_INVALID },
        { "WERR_ALREADY_EXISTS", WERR_ALREADY_EXISTS },
@@ -2705,7 +2704,6 @@ const struct werror_str_struct dos_err_strs[] = {
        { WERR_ACCESS_DENIED, "Access is denied" },
        { WERR_INVALID_PARAM, "Invalid parameter" },
        { WERR_NOT_SUPPORTED, "Not supported" },
-       { WERR_NOMEM, "Out of memory" },
        { WERR_NO_LOGON_SERVERS, "No logon servers found" },
        { WERR_NO_SUCH_LOGON_SESSION, "No such logon session" },
        { WERR_DOMAIN_CONTROLLER_NOT_FOUND, "A domain controller could not be found" },

diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index 615cd4106bfe76ef5e8dc312a4a34e7fff89f21e..07df806238c1aee22c7475d0f91deefadec79c2b 100644 (file)
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -83,7 +83,6 @@ typedef uint32_t WERROR;
    these matter for Samba, primarily in the NT printing code */
 #define WERR_OK W_ERROR(0x00000000)
 #define WERR_ACCESS_DENIED W_ERROR(0x00000005)
-#define WERR_NOMEM W_ERROR(0x00000008)
 #define WERR_GENERAL_FAILURE W_ERROR(0x0000001F)
 #define WERR_NOT_SUPPORTED W_ERROR(0x00000032)
 #define WERR_DUP_NAME W_ERROR(0x00000034)

diff --git a/source3/rpc_client/cli_winreg_spoolss.c b/source3/rpc_client/cli_winreg_spoolss.c
index f7e4be97d3cd1a979250944d0bc5a50475fac72d..10e7e47932b34454f1f68c112f496cfae2cba9db 100644 (file)
--- a/source3/rpc_client/cli_winreg_spoolss.c
+++ b/source3/rpc_client/cli_winreg_spoolss.c
@@ -1754,7 +1754,7 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx,
 
        path = winreg_printer_data_keyname(mem_ctx, sharename);
        if (path == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        result = winreg_get_secdesc(mem_ctx, winreg_handle,
@@ -1896,7 +1896,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx,
 
        path = winreg_printer_data_keyname(mem_ctx, sharename);
        if (path == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        result = winreg_set_secdesc(mem_ctx, winreg_handle,