werror: replace WERR_NOMEM with WERR_NOT_ENOUGH_MEMORY in source4/rpc_server/
authorGünther Deschner <gd@samba.org>
Thu, 3 Dec 2015 14:24:19 +0000 (15:24 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 27 Sep 2016 22:04:20 +0000 (00:04 +0200)
Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source4/rpc_server/dnsserver/dnsdata.c
source4/rpc_server/dnsserver/dnsdb.c
source4/rpc_server/drsuapi/addentry.c
source4/rpc_server/drsuapi/dcesrv_drsuapi.c
source4/rpc_server/drsuapi/getncchanges.c
source4/rpc_server/drsuapi/writespn.c
source4/rpc_server/netlogon/dcerpc_netlogon.c
source4/rpc_server/winreg/rpc_winreg.c

index 067654ad2c62f25493441889337048204a7edb31..ccea0d700a5618b8a318746dafc6c7f2ee76ac04 100644 (file)
@@ -799,7 +799,7 @@ WERROR dns_fill_records_array(TALLOC_CTX *mem_ctx,
                recs->rec = talloc_realloc(recs, recs->rec, struct DNS_RPC_RECORDS, recs->count+1);
        }
        if (recs->rec == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        i = recs->count;
        recs->rec[i].wLength = 0;
@@ -888,7 +888,7 @@ WERROR dns_fill_records_array(TALLOC_CTX *mem_ctx,
                                                        struct DNS_RPC_RECORD,
                                                        recs->rec[i].wRecordCount+1);
                                if (recs->rec[i].records == NULL) {
-                                       return WERR_NOMEM;
+                                       return WERR_NOT_ENOUGH_MEMORY;
                                }
 
                                dns_rec = &recs->rec[i].records[recs->rec[i].wRecordCount];
index 0a76030a017158e2555c058a47acfb843af17f51..544deadf30e323d6d28204dc88c3e6d11ce2643b 100644 (file)
@@ -328,7 +328,7 @@ static WERROR dnsserver_db_do_add_rec(TALLOC_CTX *mem_ctx,
        msg->dn = dn;
        ret = ldb_msg_add_string(msg, "objectClass", "dnsNode");
        if (ret != LDB_SUCCESS) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        if (num_rec > 0 && rec) {
@@ -341,7 +341,7 @@ static WERROR dnsserver_db_do_add_rec(TALLOC_CTX *mem_ctx,
 
                        ret = ldb_msg_add_value(msg, "dnsRecord", &v, NULL);
                        if (ret != LDB_SUCCESS) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
                }
        }
@@ -381,7 +381,7 @@ WERROR dnsserver_db_add_empty_node(TALLOC_CTX *mem_ctx,
        W_ERROR_HAVE_NO_MEMORY(dn);
 
        if (!ldb_dn_add_child_fmt(dn, "DC=%s", name)) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        return dnsserver_db_do_add_rec(mem_ctx, samdb, dn, 0, NULL);
@@ -449,7 +449,7 @@ WERROR dnsserver_db_add_record(TALLOC_CTX *mem_ctx,
        if (el == NULL) {
                ret = ldb_msg_add_empty(res->msgs[0], "dnsRecord", 0, &el);
                if (ret != LDB_SUCCESS) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
        }
 
@@ -746,7 +746,7 @@ static WERROR dnsserver_db_do_create_zone(TALLOC_CTX *tmp_ctx,
        sddl = talloc_asprintf(tmp_ctx, sddl_template,
                               dom_sid_string(tmp_ctx, &dnsadmins_sid));
        if (sddl == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        talloc_free(res);
 
@@ -766,7 +766,7 @@ static WERROR dnsserver_db_do_create_zone(TALLOC_CTX *tmp_ctx,
        msg->dn = zone_dn;
        ret = ldb_msg_add_string(msg, "objectClass", "dnsZone");
        if (ret != LDB_SUCCESS) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        sd_encoded = talloc_zero(tmp_ctx, DATA_BLOB);
@@ -780,7 +780,7 @@ static WERROR dnsserver_db_do_create_zone(TALLOC_CTX *tmp_ctx,
 
        ret = ldb_msg_add_steal_value(msg, "nTSecurityDescriptor", sd_encoded);
        if (ret != LDB_SUCCESS) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* dns zone Properties */
@@ -793,49 +793,49 @@ static WERROR dnsserver_db_do_create_zone(TALLOC_CTX *tmp_ctx,
        prop->id = DSPROPERTY_ZONE_TYPE;
        prop->data.zone_type = z->zoneinfo->dwZoneType;
        if (!dnsserver_db_msg_add_dnsproperty(tmp_ctx, msg, prop)) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* allow update */
        prop->id = DSPROPERTY_ZONE_ALLOW_UPDATE;
        prop->data.allow_update_flag = z->zoneinfo->fAllowUpdate;
        if (!dnsserver_db_msg_add_dnsproperty(tmp_ctx, msg, prop)) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* secure time */
        prop->id = DSPROPERTY_ZONE_SECURE_TIME;
        prop->data.zone_secure_time = 0;
        if (!dnsserver_db_msg_add_dnsproperty(tmp_ctx, msg, prop)) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* norefresh interval */
        prop->id = DSPROPERTY_ZONE_NOREFRESH_INTERVAL;
        prop->data.norefresh_hours = 168;
        if (!dnsserver_db_msg_add_dnsproperty(tmp_ctx, msg, prop)) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* refresh interval */
        prop->id = DSPROPERTY_ZONE_REFRESH_INTERVAL;
        prop->data.refresh_hours = 168;
        if (!dnsserver_db_msg_add_dnsproperty(tmp_ctx, msg, prop)) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* aging state */
        prop->id = DSPROPERTY_ZONE_AGING_STATE;
        prop->data.aging_enabled = z->zoneinfo->fAging;
        if (!dnsserver_db_msg_add_dnsproperty(tmp_ctx, msg, prop)) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* aging enabled time */
        prop->id = DSPROPERTY_ZONE_AGING_ENABLED_TIME;
        prop->data.next_scavenging_cycle_hours = 0;
        if (!dnsserver_db_msg_add_dnsproperty(tmp_ctx, msg, prop)) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        talloc_free(prop);
@@ -893,7 +893,7 @@ WERROR dnsserver_db_create_zone(struct ldb_context *samdb,
 
        if(!ldb_dn_add_child_fmt(dn, "DC=%s,CN=MicrosoftDNS", zone->name)) {
                talloc_free(tmp_ctx);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* Add dnsZone record */
@@ -905,7 +905,7 @@ WERROR dnsserver_db_create_zone(struct ldb_context *samdb,
 
        if (!ldb_dn_add_child_fmt(dn, "DC=@")) {
                talloc_free(tmp_ctx);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        dns_rec = talloc_zero_array(tmp_ctx, struct dnsp_DnssrvRpcRecord, 2);
index 9919eae61a06c9983d36dbd6072f1b5583cee41e..d071830a20646022dce7c42626f385a04f43e7de 100644 (file)
@@ -105,14 +105,14 @@ static WERROR drsuapi_add_SPNs(struct drsuapi_bind_state *b_state,
                 */
                msg = ldb_msg_new(mem_ctx);
                if (msg == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                msg->dn = ref_dn;
                ret = ldb_msg_add_empty(msg, "servicePrincipalName",
                                        LDB_FLAG_MOD_ADD, &el);
                if (ret != LDB_SUCCESS) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
 
@@ -132,7 +132,7 @@ static WERROR drsuapi_add_SPNs(struct drsuapi_bind_state *b_state,
                                                 talloc_asprintf(el->values, "ldap/%s", dNSHostName));
                }
                if (el->num_values < 2) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                ret = dsdb_modify(b_state->sam_ctx, msg, DSDB_MODIFY_PERMISSIVE);
index 35aeedb0b572f956af72cb1c5249c8c342371433..7e5b1901d53d6188058079c5fb74564d3bbbaa7d 100644 (file)
@@ -680,7 +680,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                                                          "serverReference");
 
                        if (!ntds_dn || !ldb_dn_add_child_fmt(ntds_dn, "CN=NTDS Settings")) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
 
                        ret = ldb_search(b_state->sam_ctx, mem_ctx, &res_account, ref_dn,
@@ -747,12 +747,12 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                                                          "serverReference");
 
                        if (!ntds_dn || !ldb_dn_add_child_fmt(ntds_dn, "CN=NTDS Settings")) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
 
                        /* Format is cn=<NETBIOS name>,cn=Servers,cn=<site>,cn=sites.... */
                        if (!site_dn || !ldb_dn_remove_child_components(site_dn, 2)) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
 
                        ret = ldb_search(b_state->sam_ctx, mem_ctx, &res_ntds, ntds_dn,
@@ -847,12 +847,12 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
                                                          "serverReference");
 
                        if (!ntds_dn || !ldb_dn_add_child_fmt(ntds_dn, "CN=NTDS Settings")) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
 
                        /* Format is cn=<NETBIOS name>,cn=Servers,cn=<site>,cn=sites.... */
                        if (!site_dn || !ldb_dn_remove_child_components(site_dn, 2)) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
 
                        ret = ldb_search(b_state->sam_ctx, mem_ctx, &res_ntds, ntds_dn,
index c1de242d8dbfb59fa8ac7d5184e6dfc8c6bc6849..70ec04c23172bbf75ee3c9f88123a847940ffcfb 100644 (file)
@@ -276,7 +276,7 @@ static WERROR get_nc_changes_build_object(struct drsuapi_DsReplicaObjectListItem
 
        obj->object.identifier = get_object_identifier(obj, msg);
        if (obj->object.identifier == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        dom_sid_split_rid(NULL, &obj->object.identifier->sid, NULL, &rid);
 
@@ -370,7 +370,7 @@ static WERROR get_nc_changes_build_object(struct drsuapi_DsReplicaObjectListItem
        obj->object.attribute_ctr.attributes = talloc_array(obj, struct drsuapi_DsReplicaAttribute,
                                                            obj->object.attribute_ctr.num_attributes);
        if (obj->object.attribute_ctr.attributes == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /*
@@ -1646,7 +1646,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta
                                                     (*search_res)->count);
                if ((*search_res)->msgs == NULL) {
                        TALLOC_FREE(frame);
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
 
@@ -1745,7 +1745,7 @@ WERROR dcesrv_drsuapi_DsGetNCChanges(struct dcesrv_call_state *dce_call, TALLOC_
        case 8:
                req10 = getncchanges_map_req8(mem_ctx, &r->in.req->req8);
                if (req10 == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        case 10:
@@ -1911,7 +1911,7 @@ allowed:
        if (getnc_state == NULL) {
                getnc_state = talloc_zero(b_state, struct drsuapi_getncchanges_state);
                if (getnc_state == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                b_state->getncchanges_state = getnc_state;
                getnc_state->ncRoot_dn = drs_ObjectIdentifier_to_dn(getnc_state, sam_ctx, ncRoot);
@@ -2015,7 +2015,7 @@ allowed:
                getnc_state->final_udv = talloc_zero(getnc_state,
                                        struct drsuapi_DsReplicaCursor2CtrEx);
                if (getnc_state->final_udv == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                werr = get_nc_changes_udv(sam_ctx, getnc_state->ncRoot_dn,
                                          getnc_state->final_udv);
@@ -2301,7 +2301,7 @@ allowed:
                ureq.dest_dsa_dns_name = samdb_ntds_msdcs_dns_name(b_state->sam_ctx, mem_ctx,
                                                                   &req10->destination_dsa_guid);
                if (!ureq.dest_dsa_dns_name) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                ureq.dest_dsa_guid = req10->destination_dsa_guid;
                ureq.options = DRSUAPI_DRS_ADD_REF |
@@ -2344,7 +2344,7 @@ allowed:
                        struct la_for_sorting *guid_array = talloc_array(getnc_state, struct la_for_sorting, getnc_state->la_count);
                        if (guid_array == NULL) {
                                DEBUG(0, ("Out of memory allocating %u linked attributes for sorting", getnc_state->la_count));
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
                        for (j = 0; j < getnc_state->la_count; j++) {
                                /* we need to get the target GUIDs to compare */
@@ -2402,7 +2402,7 @@ allowed:
                r->out.ctr->ctr6.linked_attributes = talloc_array(r->out.ctr, struct drsuapi_DsReplicaLinkedAttribute, link_count);
                if (r->out.ctr->ctr6.linked_attributes == NULL) {
                        DEBUG(0, ("Out of memory allocating %u linked attributes for output", link_count));
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                for (k = 0; k < link_count; k++) {
index c3bdb3fa1176ceafc43d11d286419d5d1c9fda6b..fb3b7cb6a3ff77509d98ab2829246cd8fc453574 100644 (file)
@@ -173,7 +173,7 @@ WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALL
 
                        msg = ldb_msg_new(mem_ctx);
                        if (msg == NULL) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
 
                        msg->dn = ldb_dn_new(msg, b_state->sam_ctx,
@@ -195,7 +195,7 @@ WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALL
                                                         "servicePrincipalName",
                                                         req->spn_names[i].str);
                                if (ret != LDB_SUCCESS) {
-                                       return WERR_NOMEM;
+                                       return WERR_NOT_ENOUGH_MEMORY;
                                }
                                spn_count++;
                        }
index 73ac8741012668232331f7f41c132c7d98d793cf..3fb4a1ae358f2c02abefedfd4885ff107b86c1ca 100644 (file)
@@ -1345,7 +1345,7 @@ static WERROR dcesrv_netr_LogonControl_base_call(struct dcesrv_netr_LogonControl
                        info1 = talloc_zero(state->mem_ctx,
                                            struct netr_NETLOGON_INFO_1);
                        if (info1 == NULL) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
                        state->r.out.query->info1 = info1;
                        return WERR_OK;
@@ -1354,7 +1354,7 @@ static WERROR dcesrv_netr_LogonControl_base_call(struct dcesrv_netr_LogonControl
                        info3 = talloc_zero(state->mem_ctx,
                                            struct netr_NETLOGON_INFO_3);
                        if (info3 == NULL) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
                        state->r.out.query->info3 = info3;
                        return WERR_OK;
@@ -1493,7 +1493,7 @@ static WERROR dcesrv_netr_LogonControl_base_call(struct dcesrv_netr_LogonControl
                                                  state->r.in.data,
                                                  state->r.out.query);
        if (subreq == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        state->dce_call->state_flags |= DCESRV_CALL_STATE_FLAG_ASYNC;
        tevent_req_set_callback(subreq,
@@ -1549,7 +1549,7 @@ static WERROR dcesrv_netr_LogonControl(struct dcesrv_call_state *dce_call, TALLO
 
        state = talloc_zero(mem_ctx, struct dcesrv_netr_LogonControl_base_state);
        if (state == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        state->dce_call = dce_call;
@@ -1583,7 +1583,7 @@ static WERROR dcesrv_netr_LogonControl2(struct dcesrv_call_state *dce_call, TALL
 
        state = talloc_zero(mem_ctx, struct dcesrv_netr_LogonControl_base_state);
        if (state == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        state->dce_call = dce_call;
@@ -1617,7 +1617,7 @@ static WERROR dcesrv_netr_LogonControl2Ex(struct dcesrv_call_state *dce_call, TA
 
        state = talloc_zero(mem_ctx, struct dcesrv_netr_LogonControl_base_state);
        if (state == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        state->dce_call = dce_call;
@@ -2958,7 +2958,7 @@ static WERROR dcesrv_netr_DsRGetForestTrustInformation(struct dcesrv_call_state
        state = talloc_zero(mem_ctx,
                        struct dcesrv_netr_DsRGetForestTrustInformation_state);
        if (state == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        state->dce_call = dce_call;
        state->mem_ctx = mem_ctx;
@@ -2986,7 +2986,7 @@ static WERROR dcesrv_netr_DsRGetForestTrustInformation(struct dcesrv_call_state
                                                r->in.flags,
                                                r->out.forest_trust_info);
        if (subreq == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        state->dce_call->state_flags |= DCESRV_CALL_STATE_FLAG_ASYNC;
        tevent_req_set_callback(subreq,
index 4f754b84d53bdf2eeb27f2ed5528230622d1b90d..dfc1d2133b85e153324d21c5b68fc52023a5b8ee 100644 (file)
@@ -154,7 +154,7 @@ static WERROR dcesrv_winreg_CreateKey(struct dcesrv_call_state *dce_call,
                r->out.action_taken = talloc(mem_ctx, enum winreg_CreateAction);
                if (r->out.action_taken == NULL) {
                        talloc_free(newh);
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                *r->out.action_taken = REG_ACTION_NONE;
 
@@ -313,7 +313,7 @@ static WERROR dcesrv_winreg_EnumValue(struct dcesrv_call_state *dce_call,
 
        r->out.type = talloc(mem_ctx, enum winreg_Type);
        if (!r->out.type) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        *r->out.type = (enum winreg_Type) data_type;
 
@@ -532,17 +532,17 @@ static WERROR dcesrv_winreg_QueryValue(struct dcesrv_call_state *dce_call,
 
                r->out.type = talloc(mem_ctx, enum winreg_Type);
                if (!r->out.type) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                *r->out.type = (enum winreg_Type) value_type;
                r->out.data_length = talloc(mem_ctx, uint32_t);
                if (!r->out.data_length) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                *r->out.data_length = value_data.length;
                r->out.data_size = talloc(mem_ctx, uint32_t);
                if (!r->out.data_size) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                *r->out.data_size = value_data.length;
                r->out.data = value_data.data;