sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

werror: replace WERR_NOMEM with WERR_NOT_ENOUGH_MEMORY in source4/dns_server/

Browse Source 
Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Günther Deschner
2015-12-03 15:24:18 +01:00
committed by Jeremy Allison
parent ead4e90edb
commit c1c079cf3d
6 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source4/dns_server/dns_crypto.c
View File

@ -133,7 +133,7 @@ WERROR dns_verify_tsig(struct dns_server *dns,
state->tsig = talloc_zero(state->mem_ctx, struct dns_res_rec); state->tsig = talloc_zero(state->mem_ctx, struct dns_res_rec);
if (state->tsig == NULL) { if (state->tsig == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
werror = dns_copy_tsig(state->tsig, &packet->additional[i], 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->key_name = talloc_strdup(state->mem_ctx,
state->tsig->name); state->tsig->name);
if (state->key_name == NULL) { if (state->key_name == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
state->tsig_error = DNS_RCODE_BADKEY; state->tsig_error = DNS_RCODE_BADKEY;
return DNS_ERR(NOTAUTH); 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); state->key_name = talloc_strdup(state->mem_ctx, tkey->name);
if (state->key_name == NULL) { if (state->key_name == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
/* FIXME: check TSIG here */ /* FIXME: check TSIG here */
if (check_rec == NULL) { if (check_rec == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
/* first build and verify check packet */ /* first build and verify check packet */
check_rec->name = talloc_strdup(check_rec, tkey->name); check_rec->name = talloc_strdup(check_rec, tkey->name);
if (check_rec->name == NULL) { if (check_rec->name == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
check_rec->rr_class = DNS_QCLASS_ANY; check_rec->rr_class = DNS_QCLASS_ANY;
check_rec->ttl = 0; check_rec->ttl = 0;
check_rec->algorithm_name = talloc_strdup(check_rec, tkey->algorithm); check_rec->algorithm_name = talloc_strdup(check_rec, tkey->algorithm);
if (check_rec->algorithm_name == NULL) { if (check_rec->algorithm_name == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
check_rec->time_prefix = 0; check_rec->time_prefix = 0;
check_rec->time = state->tsig->rdata.tsig_record.time; 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_len = packet_len + fake_tsig_blob.length;
buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len); buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len);
if (buffer == NULL) { if (buffer == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
memcpy(buffer, in->data, packet_len); 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.length = state->tsig->rdata.tsig_record.mac_size;
sig.data = talloc_memdup(mem_ctx, state->tsig->rdata.tsig_record.mac, sig.length); sig.data = talloc_memdup(mem_ctx, state->tsig->rdata.tsig_record.mac, sig.length);
if (sig.data == NULL) { if (sig.data == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
/* Now we also need to count down the additional record counter */ /* 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; size_t mac_size = 0;
if (check_rec == NULL) { if (check_rec == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
/* first build and verify check packet */ /* first build and verify check packet */
check_rec->name = talloc_strdup(check_rec, tkey->name); check_rec->name = talloc_strdup(check_rec, tkey->name);
if (check_rec->name == NULL) { if (check_rec->name == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
check_rec->rr_class = DNS_QCLASS_ANY; check_rec->rr_class = DNS_QCLASS_ANY;
check_rec->ttl = 0; check_rec->ttl = 0;
check_rec->algorithm_name = talloc_strdup(check_rec, tkey->algorithm); check_rec->algorithm_name = talloc_strdup(check_rec, tkey->algorithm);
if (check_rec->algorithm_name == NULL) { if (check_rec->algorithm_name == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
check_rec->time_prefix = 0; check_rec->time_prefix = 0;
check_rec->time = current_time; 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); buffer = talloc_zero_array(mem_ctx, uint8_t, buffer_len);
if (buffer == NULL) { if (buffer == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
p = buffer; p = buffer;
@ -368,7 +368,7 @@ WERROR dns_sign_tsig(struct dns_server *dns,
tsig = talloc_zero(mem_ctx, struct dns_res_rec); tsig = talloc_zero(mem_ctx, struct dns_res_rec);
if (tsig == NULL) { if (tsig == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
if (state->tsig_error == DNS_RCODE_OK) { 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); tsig->name = talloc_strdup(tsig, state->key_name);
if (tsig->name == NULL) { if (tsig->name == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
tsig->rr_class = DNS_QCLASS_ANY; tsig->rr_class = DNS_QCLASS_ANY;
tsig->rr_type = DNS_QTYPE_TSIG; tsig->rr_type = DNS_QTYPE_TSIG;
@ -409,14 +409,14 @@ WERROR dns_sign_tsig(struct dns_server *dns,
if (packet->arcount == 0) { if (packet->arcount == 0) {
packet->additional = talloc_zero(mem_ctx, struct dns_res_rec); packet->additional = talloc_zero(mem_ctx, struct dns_res_rec);
if (packet->additional == NULL) { if (packet->additional == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
} }
packet->additional = talloc_realloc(mem_ctx, packet->additional, packet->additional = talloc_realloc(mem_ctx, packet->additional,
struct dns_res_rec, struct dns_res_rec,
packet->arcount + 1); packet->arcount + 1);
if (packet->additional == NULL) { if (packet->additional == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
werror = dns_copy_tsig(mem_ctx, tsig, werror = dns_copy_tsig(mem_ctx, tsig,

36
source4/dns_server/dns_query.c
View File

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

2
source4/dns_server/dns_server.c
View File

@ -272,7 +272,7 @@ static WERROR dns_process_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
drop: drop:
*out = data_blob_talloc(mem_ctx, state->in->data, state->in->length); *out = data_blob_talloc(mem_ctx, state->in->data, state->in->length);
if (out->data == NULL) { if (out->data == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
out->data[2] |= 0x80; /* Toggle DNS_FLAG_REPLY */ out->data[2] |= 0x80; /* Toggle DNS_FLAG_REPLY */
out->data[3] |= state->dns_err; out->data[3] |= state->dns_err;

2
source4/dns_server/dns_update.c
View File

@ -356,7 +356,7 @@ static WERROR dns_rr_to_dnsp(TALLOC_CTX *mem_ctx,
&rrec->rdata.txt_record.txt, &rrec->rdata.txt_record.txt,
&r->data.txt); &r->data.txt);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
break; break;

2
source4/dns_server/dns_utils.c
View File

@ -191,7 +191,7 @@ WERROR dns_generate_options(struct dns_server *dns,
o = talloc_zero(mem_ctx, struct dns_res_rec); o = talloc_zero(mem_ctx, struct dns_res_rec);
if (o == NULL) { if (o == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
o->name = NULL; o->name = NULL;
o->rr_type = DNS_QTYPE_OPT; o->rr_type = DNS_QTYPE_OPT;

4
source4/dns_server/dnsserver_common.c
View File

@ -83,7 +83,7 @@ WERROR dns_common_extract(const struct ldb_message_element *el,
recs = talloc_zero_array(mem_ctx, struct dnsp_DnssrvRpcRecord, recs = talloc_zero_array(mem_ctx, struct dnsp_DnssrvRpcRecord,
el->num_values); el->num_values);
if (recs == NULL) { if (recs == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
for (ri = 0; ri < el->num_values; ri++) { for (ri = 0; ri < el->num_values; ri++) {
struct ldb_val *v = &el->values[ri]; struct ldb_val *v = &el->values[ri];
@ -162,7 +162,7 @@ WERROR dns_common_lookup(struct ldb_context *samdb,
struct dnsp_DnssrvRpcRecord, struct dnsp_DnssrvRpcRecord,
1); 1);
if (recs == NULL) { if (recs == NULL) {
return WERR_NOMEM; return WERR_NOT_ENOUGH_MEMORY;
} }
recs[0] = (struct dnsp_DnssrvRpcRecord) { recs[0] = (struct dnsp_DnssrvRpcRecord) {
.wType = DNS_TYPE_TOMBSTONE, .wType = DNS_TYPE_TOMBSTONE,