werror: replace WERR_GENERAL_FAILURE with WERR_GEN_FAILURE in source4/rpc_server/

Guenther

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

diff --git a/source4/rpc_server/dnsserver/dnsdb.c b/source4/rpc_server/dnsserver/dnsdb.c
index 544deadf30e323d6d28204dc88c3e6d11ce2643b..949a8b9b05e3a02d48c70d87cabcf97b21819471 100644 (file)
--- a/source4/rpc_server/dnsserver/dnsdb.c
+++ b/source4/rpc_server/dnsserver/dnsdb.c
@@ -336,7 +336,7 @@ static WERROR dnsserver_db_do_add_rec(TALLOC_CTX *mem_ctx,
                        ndr_err = ndr_push_struct_blob(&v, mem_ctx, &rec[i],
                                        (ndr_push_flags_fn_t)ndr_push_dnsp_DnssrvRpcRecord);
                        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
 
                        ret = ldb_msg_add_value(msg, "dnsRecord", &v, NULL);
@@ -465,7 +465,7 @@ WERROR dnsserver_db_add_record(TALLOC_CTX *mem_ctx,
                ndr_err = ndr_pull_struct_blob(&el->values[i], mem_ctx, &rec2,
                                                (ndr_pull_flags_fn_t)ndr_pull_dnsp_DnssrvRpcRecord);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       return WERR_GENERAL_FAILURE;
+                       return WERR_GEN_FAILURE;
                }
 
                if (dns_record_match(rec, &rec2)) {
@@ -485,7 +485,7 @@ WERROR dnsserver_db_add_record(TALLOC_CTX *mem_ctx,
        ndr_err = ndr_push_struct_blob(&el->values[i], mem_ctx, rec,
                                        (ndr_push_flags_fn_t)ndr_push_dnsp_DnssrvRpcRecord);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        el->flags = LDB_FLAG_MOD_REPLACE;
@@ -553,7 +553,7 @@ WERROR dnsserver_db_update_record(TALLOC_CTX *mem_ctx,
                ndr_err = ndr_pull_struct_blob(&el->values[i], mem_ctx, &rec2,
                                                (ndr_pull_flags_fn_t)ndr_pull_dnsp_DnssrvRpcRecord);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       return WERR_GENERAL_FAILURE;
+                       return WERR_GEN_FAILURE;
                }
 
                if (dns_record_match(arec, &rec2)) {
@@ -571,7 +571,7 @@ WERROR dnsserver_db_update_record(TALLOC_CTX *mem_ctx,
                ndr_err = ndr_pull_struct_blob(&el->values[i], mem_ctx, &rec2,
                                                (ndr_pull_flags_fn_t)ndr_pull_dnsp_DnssrvRpcRecord);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       return WERR_GENERAL_FAILURE;
+                       return WERR_GEN_FAILURE;
                }
 
                if (dns_record_match(drec, &rec2)) {
@@ -594,7 +594,7 @@ WERROR dnsserver_db_update_record(TALLOC_CTX *mem_ctx,
        ndr_err = ndr_push_struct_blob(&el->values[i], mem_ctx, arec,
                                        (ndr_push_flags_fn_t)ndr_push_dnsp_DnssrvRpcRecord);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        el->flags = LDB_FLAG_MOD_REPLACE;
@@ -651,7 +651,7 @@ WERROR dnsserver_db_delete_record(TALLOC_CTX *mem_ctx,
                ndr_err = ndr_pull_struct_blob(&el->values[i], mem_ctx, &rec2,
                                                (ndr_pull_flags_fn_t)ndr_pull_dnsp_DnssrvRpcRecord);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       return WERR_GENERAL_FAILURE;
+                       return WERR_GEN_FAILURE;
                }
 
                if (dns_record_match(rec, &rec2)) {
@@ -757,7 +757,7 @@ static WERROR dnsserver_db_do_create_zone(TALLOC_CTX *tmp_ctx,
 
        secdesc = sddl_decode(tmp_ctx, sddl, domain_sid);
        if (secdesc == NULL) {
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        msg = ldb_msg_new(tmp_ctx);
@@ -775,7 +775,7 @@ static WERROR dnsserver_db_do_create_zone(TALLOC_CTX *tmp_ctx,
        ndr_err = ndr_push_struct_blob(sd_encoded, tmp_ctx, secdesc,
                        (ndr_push_flags_fn_t)ndr_push_security_descriptor);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        ret = ldb_msg_add_steal_value(msg, "nTSecurityDescriptor", sd_encoded);

diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index 7e5b1901d53d6188058079c5fb74564d3bbbaa7d..16a611aa6c5a3824ac2e12bf1601f9db362fd171 100644 (file)
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -658,7 +658,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
        if (ret) {
                DEBUG(1, ("searching for servers in sites DN %s failed: %s\n", 
                          ldb_dn_get_linearized(sites_dn), ldb_errstring(b_state->sam_ctx)));
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        switch (*r->out.level_out) {
@@ -706,7 +706,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                                                                 LDB_SCOPE_BASE, attrs_none, "fSMORoleOwner=%s",
                                                                 ldb_dn_get_linearized(ntds_dn));
                                        if (ret) {
-                                               return WERR_GENERAL_FAILURE;
+                                               return WERR_GEN_FAILURE;
                                        }
                                        if (res_domain->count == 1) {
                                                ctr1->array[i].is_pdc = true;

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 3fb4a1ae358f2c02abefedfd4885ff107b86c1ca..46efd5fd7abd1dd12d98316fae2ab5ec089addb2 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -2644,7 +2644,7 @@ static WERROR fill_trusted_domains_array(TALLOC_CTX *mem_ctx,
                                    ldb_get_default_basedn(sam_ctx),
                                    "(&(objectClass=container)(cn=System))");
        if (!system_dn) {
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        ret = gendb_search(sam_ctx, mem_ctx, system_dn,
@@ -2770,7 +2770,7 @@ static WERROR dcesrv_netr_DsrEnumerateDomainTrusts(struct dcesrv_call_state *dce
        sam_ctx = samdb_connect(mem_ctx, dce_call->event_ctx, lp_ctx,
                                dce_call->conn->auth_state.session_info, 0);
        if (sam_ctx == NULL) {
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        if ((r->in.trust_flags & NETR_TRUST_FLAG_INBOUND) ||
@@ -2788,7 +2788,7 @@ static WERROR dcesrv_netr_DsrEnumerateDomainTrusts(struct dcesrv_call_state *dce
                ret = gendb_search_dn(sam_ctx, mem_ctx, NULL,
                                      &dom_res, dom_attrs);
                if (ret != 1) {
-                       return WERR_GENERAL_FAILURE;
+                       return WERR_GEN_FAILURE;
                }
 
                trusts->count = n + 1;
@@ -2903,17 +2903,17 @@ static WERROR dcesrv_netr_DsRGetForestTrustInformation(struct dcesrv_call_state
        sam_ctx = samdb_connect(mem_ctx, dce_call->event_ctx, lp_ctx,
                                dce_call->conn->auth_state.session_info, 0);
        if (sam_ctx == NULL) {
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        domain_dn = ldb_get_default_basedn(sam_ctx);
        if (domain_dn == NULL) {
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        forest_dn = ldb_get_root_basedn(sam_ctx);
        if (forest_dn == NULL) {
-               return WERR_GENERAL_FAILURE;
+               return WERR_GEN_FAILURE;
        }
 
        cmp = ldb_dn_compare(domain_dn, forest_dn);

diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index 4fd6d32e303616664a026f1de20e331049450f76..71b62bf2d0a485d6bf17e6cb49ffe1b522fd526e 100644 (file)
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -736,7 +736,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        info.info0 = &ctr0->array[i];
                        status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.info_ctr->level, &info);
@@ -777,7 +777,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        info.info1 = &ctr1->array[i];
                        status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.info_ctr->level, &info);
@@ -821,7 +821,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        info.info2 = &ctr2->array[i];
                        status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.info_ctr->level, &info);
@@ -865,7 +865,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        info.info501 = &ctr501->array[i];
                        status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.info_ctr->level, &info);
@@ -909,7 +909,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        info.info502 = &ctr502->array[i];
                        status = dcesrv_srvsvc_fiel_ShareInfo(dce_call, mem_ctx, scfg, r->in.info_ctr->level, &info);
@@ -1826,7 +1826,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
                        
                        type = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
@@ -1878,7 +1878,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
 
                        type = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
@@ -1932,7 +1932,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
 
                        type = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);
@@ -1986,7 +1986,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
                        nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg);
                        if (!NT_STATUS_IS_OK(nterr)) {
                                DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i]));
-                               return WERR_GENERAL_FAILURE;
+                               return WERR_GEN_FAILURE;
                        }
 
                        type = dcesrv_common_get_share_type(mem_ctx, dce_ctx, scfg);