werror: replace WERR_GENERAL_FAILURE with WERR_GEN_FAILURE in source3/rpc_server/

Guenther

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

diff --git a/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c b/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
index 850206bfd5ae8f54f0acfc8a91bb5abbd9817e25..a3898f21eda872a35fb8c583d6509bd169a4defc 100644 (file)
--- a/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
+++ b/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
@@ -136,11 +136,11 @@ WERROR _PNP_GetDeviceRegProp(struct pipes_struct *p,
                /* just parse the service name from the device path and then
                   lookup the display name */
                if ( !(ptr = strrchr_m( r->in.devicepath, '\\' )) )
-                       return WERR_GENERAL_FAILURE;
+                       return WERR_GEN_FAILURE;
                *ptr = '\0';
 
                if ( !(ptr = strrchr_m( r->in.devicepath, '_' )) )
-                       return WERR_GENERAL_FAILURE;
+                       return WERR_GEN_FAILURE;
                ptr++;
 
                mem_ctx = talloc_stackframe();
@@ -150,12 +150,12 @@ WERROR _PNP_GetDeviceRegProp(struct pipes_struct *p,
                                                p->session_info,
                                                ptr);
                if (result == NULL) {
-                       return WERR_GENERAL_FAILURE;
+                       return WERR_GEN_FAILURE;
                }
 
                if (!push_reg_sz(mem_ctx, &blob, result)) {
                        talloc_free(mem_ctx);
-                       return WERR_GENERAL_FAILURE;
+                       return WERR_GEN_FAILURE;
                }
 
                if (*r->in.buffer_size < blob.length) {

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 29e52f268006a701ca498dc427279223710cbc77..18ae6eb8cfd85b4e104b54c14523500e050b18d6 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -2355,7 +2355,7 @@ static WERROR getprinterdata_printer_server(TALLOC_CTX *mem_ctx,
                ndr_err = ndr_push_struct_blob(&blob, mem_ctx, &os,
                        (ndr_push_flags_fn_t)ndr_push_spoolss_OSVersion);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       return WERR_GENERAL_FAILURE;
+                       return WERR_GEN_FAILURE;
                }
 
                if (DEBUGLEVEL >= 10) {
@@ -10453,7 +10453,7 @@ static WERROR xcvtcp_addport(TALLOC_CTX *mem_ctx,
        /* peek for spoolss_PortData version */
 
        if (!in || (in->length < (128 + 4))) {
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        version = IVAL(in->data, 128);