diff options
| author | Kai Blin <kai@samba.org> | 2012-09-05 11:07:55 +0200 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2012-09-05 14:10:54 +0200 |
| commit | 558fa4c45a87704c57893d61a5431fc8bb51385a (patch) | |
| tree | 4762f19917ac8e8e1bd2f2b82a2bee79bfae5717 /source4/dns_server/dns_server.c | |
| parent | 92bd7b0db82bffc951af7862edde95852edc756d (diff) | |
| download | samba-558fa4c45a87704c57893d61a5431fc8bb51385a.tar.gz samba-558fa4c45a87704c57893d61a5431fc8bb51385a.tar.bz2 samba-558fa4c45a87704c57893d61a5431fc8bb51385a.zip | |
s4 dns: Revert erroneous push from wrong branch
I've pushed the wrong branch for this, sorry about that.
Autobuild-User(master): Kai Blin <kai@samba.org>
Autobuild-Date(master): Wed Sep 5 14:10:54 CEST 2012 on sn-devel-104
Diffstat (limited to 'source4/dns_server/dns_server.c')
| -rw-r--r-- | source4/dns_server/dns_server.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c index c5f516dd20..887fc8ee1d 100644 --- a/source4/dns_server/dns_server.c +++ b/source4/dns_server/dns_server.c @@ -98,7 +98,6 @@ static void dns_tcp_send(struct stream_connection *conn, uint16_t flags) struct dns_process_state { DATA_BLOB *in; - struct dns_server *dns; struct dns_name_packet in_packet; struct dns_request_state state; uint16_t dns_err; @@ -124,8 +123,6 @@ static struct tevent_req *dns_process_send(TALLOC_CTX *mem_ctx, } state->in = in; - state->dns = dns; - if (in->length < 12) { tevent_req_werror(req, WERR_INVALID_PARAM); return tevent_req_post(req, ev); @@ -145,14 +142,6 @@ static struct tevent_req *dns_process_send(TALLOC_CTX *mem_ctx, NDR_PRINT_DEBUG(dns_name_packet, &state->in_packet); } - ret = dns_verify_tsig(dns, state, &state->state, &state->in_packet, in); - if (!W_ERROR_IS_OK(ret)) { - DEBUG(0, ("Bailing out early!\n")); - state->dns_err = werr_to_dns_err(ret); - tevent_req_done(req); - return tevent_req_post(req, ev); - } - state->state.flags = state->in_packet.operation; state->state.flags |= DNS_FLAG_REPLY; @@ -226,18 +215,6 @@ static WERROR dns_process_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, } state->out_packet.operation |= state->state.flags; - if (state->state.sign) { - DEBUG(0, ("Signing\n")); - ret = dns_sign_tsig(state->dns, mem_ctx, &state->state, - &state->out_packet, 0); - if (!W_ERROR_IS_OK(ret)) { - state->dns_err = DNS_RCODE_SERVFAIL; - goto drop; - } - } - - //NDR_PRINT_DEBUG(dns_name_packet, &state->out_packet); - ndr_err = ndr_push_struct_blob( out, mem_ctx, &state->out_packet, (ndr_push_flags_fn_t)ndr_push_dns_name_packet); |