werror: replace WERR_NOMEM with WERR_NOT_ENOUGH_MEMORY in source4/dns_server/

Guenther

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

diff --git a/source4/dns_server/dns_crypto.c b/source4/dns_server/dns_crypto.c
index dc375aeae28bb159082c46a0662bc3fe307817b4..462b7ff8ae413c21f98404108e831d50d108f0b1 100644 (file)
--- a/source4/dns_server/dns_crypto.c
+++ b/source4/dns_server/dns_crypto.c
@@ -133,7 +133,7 @@ WERROR dns_verify_tsig(struct dns_server *dns,
 
        state->tsig = talloc_zero(state->mem_ctx, struct dns_res_rec);
        if (state->tsig == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        werror = dns_copy_tsig(state->tsig, &packet->additional[i],
@@ -154,7 +154,7 @@ WERROR dns_verify_tsig(struct dns_server *dns,
                state->key_name = talloc_strdup(state->mem_ctx,
                                                state->tsig->name);
                if (state->key_name == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                state->tsig_error = DNS_RCODE_BADKEY;
                return DNS_ERR(NOTAUTH);
@@ -167,24 +167,24 @@ WERROR dns_verify_tsig(struct dns_server *dns,
         */
        state->key_name = talloc_strdup(state->mem_ctx, tkey->name);
        if (state->key_name == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* FIXME: check TSIG here */
        if (check_rec == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* first build and verify check packet */
        check_rec->name = talloc_strdup(check_rec, tkey->name);
        if (check_rec->name == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        check_rec->rr_class = DNS_QCLASS_ANY;
        check_rec->ttl = 0;
        check_rec->algorithm_name = talloc_strdup(check_rec, tkey->algorithm);
        if (check_rec->algorithm_name == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        check_rec->time_prefix = 0;
        check_rec->time = state->tsig->rdata.tsig_record.time;
@@ -215,7 +215,7 @@ WERROR dns_verify_tsig(struct dns_server *dns,
        buffer_len = packet_len + fake_tsig_blob.length;
        buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len);
        if (buffer == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        memcpy(buffer, in->data, packet_len);
@@ -224,7 +224,7 @@ WERROR dns_verify_tsig(struct dns_server *dns,
        sig.length = state->tsig->rdata.tsig_record.mac_size;
        sig.data = talloc_memdup(mem_ctx, state->tsig->rdata.tsig_record.mac, sig.length);
        if (sig.data == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* Now we also need to count down the additional record counter */
@@ -266,19 +266,19 @@ static WERROR dns_tsig_compute_mac(TALLOC_CTX *mem_ctx,
        size_t mac_size = 0;
 
        if (check_rec == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* first build and verify check packet */
        check_rec->name = talloc_strdup(check_rec, tkey->name);
        if (check_rec->name == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        check_rec->rr_class = DNS_QCLASS_ANY;
        check_rec->ttl = 0;
        check_rec->algorithm_name = talloc_strdup(check_rec, tkey->algorithm);
        if (check_rec->algorithm_name == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        check_rec->time_prefix = 0;
        check_rec->time = current_time;
@@ -320,7 +320,7 @@ static WERROR dns_tsig_compute_mac(TALLOC_CTX *mem_ctx,
 
        buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len);
        if (buffer == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        p = buffer;
@@ -368,7 +368,7 @@ WERROR dns_sign_tsig(struct dns_server *dns,
 
        tsig = talloc_zero(mem_ctx, struct dns_res_rec);
        if (tsig == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        if (state->tsig_error == DNS_RCODE_OK) {
@@ -387,7 +387,7 @@ WERROR dns_sign_tsig(struct dns_server *dns,
 
        tsig->name = talloc_strdup(tsig, state->key_name);
        if (tsig->name == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        tsig->rr_class = DNS_QCLASS_ANY;
        tsig->rr_type = DNS_QTYPE_TSIG;
@@ -409,14 +409,14 @@ WERROR dns_sign_tsig(struct dns_server *dns,
        if (packet->arcount == 0) {
                packet->additional = talloc_zero(mem_ctx, struct dns_res_rec);
                if (packet->additional == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
        }
        packet->additional = talloc_realloc(mem_ctx, packet->additional,
                                            struct dns_res_rec,
                                            packet->arcount + 1);
        if (packet->additional == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        werror = dns_copy_tsig(mem_ctx, tsig,

diff --git a/source4/dns_server/dns_query.c b/source4/dns_server/dns_query.c
index 3e9359ee6661fcb922d99a314a4bfb77bb0bf8d3..c0ae19a4dd4f9be0aa7b210729bb6518b5d8b6dc 100644 (file)
--- a/source4/dns_server/dns_query.c
+++ b/source4/dns_server/dns_query.c
@@ -63,7 +63,7 @@ static WERROR add_response_rr(const char *name,
         */
        ans = talloc_realloc(ans, ans, struct dns_res_rec, ai+1);
        if (ans == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        ZERO_STRUCT(ans[ai]);
@@ -115,7 +115,7 @@ static WERROR add_response_rr(const char *name,
                ans[ai].rdata.mx_record.exchange = talloc_strdup(
                        ans, rec->data.mx.nameTarget);
                if (ans[ai].rdata.mx_record.exchange == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        case DNS_QTYPE_TXT:
@@ -123,7 +123,7 @@ static WERROR add_response_rr(const char *name,
                                                    &rec->data.txt,
                                                    &ans[ai].rdata.txt_record.txt);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        default:
@@ -156,7 +156,7 @@ static WERROR add_dns_res_rec(struct dns_res_rec **pdst,
 
        dst = talloc_realloc(dst, dst, struct dns_res_rec, di+1);
        if (dst == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        ZERO_STRUCT(dst[di]);
@@ -170,7 +170,7 @@ static WERROR add_dns_res_rec(struct dns_res_rec **pdst,
        };
 
        if (dst[di].name == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        switch (src->rr_type) {
@@ -178,28 +178,28 @@ static WERROR add_dns_res_rec(struct dns_res_rec **pdst,
                dst[di].rdata.cname_record = talloc_strdup(
                        dst, src->rdata.cname_record);
                if (dst[di].rdata.cname_record == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        case DNS_QTYPE_A:
                dst[di].rdata.ipv4_record = talloc_strdup(
                        dst, src->rdata.ipv4_record);
                if (dst[di].rdata.ipv4_record == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        case DNS_QTYPE_AAAA:
                dst[di].rdata.ipv6_record = talloc_strdup(
                        dst, src->rdata.ipv6_record);
                if (dst[di].rdata.ipv6_record == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        case DNS_TYPE_NS:
                dst[di].rdata.ns_record = talloc_strdup(
                        dst, src->rdata.ns_record);
                if (dst[di].rdata.ns_record == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        case DNS_QTYPE_SRV:
@@ -211,7 +211,7 @@ static WERROR add_dns_res_rec(struct dns_res_rec **pdst,
                                dst, src->rdata.srv_record.target)
                };
                if (dst[di].rdata.srv_record.target == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        case DNS_QTYPE_SOA:
@@ -229,7 +229,7 @@ static WERROR add_dns_res_rec(struct dns_res_rec **pdst,
 
                if ((dst[di].rdata.soa_record.mname == NULL) ||
                    (dst[di].rdata.soa_record.rname == NULL)) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                break;
@@ -237,7 +237,7 @@ static WERROR add_dns_res_rec(struct dns_res_rec **pdst,
                dst[di].rdata.ptr_record = talloc_strdup(
                        dst, src->rdata.ptr_record);
                if (dst[di].rdata.ptr_record == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        case DNS_QTYPE_MX:
@@ -248,7 +248,7 @@ static WERROR add_dns_res_rec(struct dns_res_rec **pdst,
                };
 
                if (dst[di].rdata.mx_record.exchange == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        case DNS_QTYPE_TXT:
@@ -256,7 +256,7 @@ static WERROR add_dns_res_rec(struct dns_res_rec **pdst,
                                                    &src->rdata.txt_record.txt,
                                                    &dst[di].rdata.txt_record.txt);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                break;
        default:
@@ -816,12 +816,12 @@ static WERROR handle_tkey(struct dns_server *dns,
 
        ret_tkey = talloc_zero(mem_ctx, struct dns_res_rec);
        if (ret_tkey == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        ret_tkey->name = talloc_strdup(ret_tkey, in_tkey->name);
        if (ret_tkey->name == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        ret_tkey->rr_type = DNS_QTYPE_TKEY;
@@ -831,7 +831,7 @@ static WERROR handle_tkey(struct dns_server *dns,
        ret_tkey->rdata.tkey_record.algorithm = talloc_strdup(ret_tkey,
                        in_tkey->rdata.tkey_record.algorithm);
        if (ret_tkey->rdata.tkey_record.algorithm  == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        ret_tkey->rdata.tkey_record.inception = in_tkey->rdata.tkey_record.inception;
@@ -885,7 +885,7 @@ static WERROR handle_tkey(struct dns_server *dns,
                        state->sign = true;
                        state->key_name = talloc_strdup(state->mem_ctx, tkey->name);
                        if (state->key_name == NULL) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
                } else {
                        DEBUG(1, ("GSS key negotiation returned %s\n", nt_errstr(status)));

diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c
index 347cdb7f7d48e67d5e6a1728a6e794f65814c6b9..db7c2f2d5ba05d4f6fc47b67f7e3effeb031f0b8 100644 (file)
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -272,7 +272,7 @@ static WERROR dns_process_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
 drop:
        *out = data_blob_talloc(mem_ctx, state->in->data, state->in->length);
        if (out->data == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        out->data[2] |= 0x80; /* Toggle DNS_FLAG_REPLY */
        out->data[3] |= state->dns_err;

diff --git a/source4/dns_server/dns_update.c b/source4/dns_server/dns_update.c
index 60a4b366a01514831a72e47e81035090c7cfcdd7..bb41a9c7eb77b800db4a610c94bfe9ccf2509f3b 100644 (file)
--- a/source4/dns_server/dns_update.c
+++ b/source4/dns_server/dns_update.c
@@ -356,7 +356,7 @@ static WERROR dns_rr_to_dnsp(TALLOC_CTX *mem_ctx,
                                                    &rrec->rdata.txt_record.txt,
                                                    &r->data.txt);
                if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                break;

diff --git a/source4/dns_server/dns_utils.c b/source4/dns_server/dns_utils.c
index 8107364b12af939245a0f576c194b7e4ea853ab5..c728eaa8d395a874df084f4a721a20a0d13d5667 100644 (file)
--- a/source4/dns_server/dns_utils.c
+++ b/source4/dns_server/dns_utils.c
@@ -191,7 +191,7 @@ WERROR dns_generate_options(struct dns_server *dns,
 
        o = talloc_zero(mem_ctx, struct dns_res_rec);
        if (o == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        o->name = NULL;
        o->rr_type = DNS_QTYPE_OPT;

diff --git a/source4/dns_server/dnsserver_common.c b/source4/dns_server/dnsserver_common.c
index 9b3e6305e3124268ccfcd8883f4d25d6fccf9f2c..db42bcb5981cb9ead5200c3c91d8e58f34e0fbd0 100644 (file)
--- a/source4/dns_server/dnsserver_common.c
+++ b/source4/dns_server/dnsserver_common.c
@@ -83,7 +83,7 @@ WERROR dns_common_extract(const struct ldb_message_element *el,
        recs = talloc_zero_array(mem_ctx, struct dnsp_DnssrvRpcRecord,
                                 el->num_values);
        if (recs == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        for (ri = 0; ri < el->num_values; ri++) {
                struct ldb_val *v = &el->values[ri];
@@ -162,7 +162,7 @@ WERROR dns_common_lookup(struct ldb_context *samdb,
                                            struct dnsp_DnssrvRpcRecord,
                                            1);
                        if (recs == NULL) {
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
                        recs[0] = (struct dnsp_DnssrvRpcRecord) {
                                .wType = DNS_TYPE_TOMBSTONE,