dns: Provide local and remote socket address to GENSEC

[bbaumbach/samba-autobuild/.git] / source4 / dns_server / dns_query.c

diff --git a/source4/dns_server/dns_query.c b/source4/dns_server/dns_query.c
index c0ae19a4dd4f9be0aa7b210729bb6518b5d8b6dc..366696ddd01cdcf6b59ff69689c8515fbc8ca967 100644 (file)
--- a/source4/dns_server/dns_query.c
+++ b/source4/dns_server/dns_query.c
@@ -702,6 +702,8 @@ static WERROR handle_authoritative_recv(struct tevent_req *req)
 static NTSTATUS create_tkey(struct dns_server *dns,
                            const char* name,
                            const char* algorithm,
+                           const struct tsocket_address *remote_address,
+                           const struct tsocket_address *local_address,
                            struct dns_server_tkey **tkey)
 {
        NTSTATUS status;
@@ -738,6 +740,24 @@ static NTSTATUS create_tkey(struct dns_server *dns,
 
        gensec_want_feature(k->gensec, GENSEC_FEATURE_SIGN);
 
+       status = gensec_set_remote_address(k->gensec,
+                                          remote_address);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("Failed to set remote address into GENSEC: %s\n",
+                         nt_errstr(status)));
+               *tkey = NULL;
+               return status;
+       }
+
+       status = gensec_set_local_address(k->gensec,
+                                         local_address);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("Failed to set local address into GENSEC: %s\n",
+                         nt_errstr(status)));
+               *tkey = NULL;
+               return status;
+       }
+
        status = gensec_start_mech_by_oid(k->gensec, GENSEC_OID_SPNEGO);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -861,6 +881,8 @@ static WERROR handle_tkey(struct dns_server *dns,
                if (tkey == NULL) {
                        status  = create_tkey(dns, in->questions[0].name,
                                              in_tkey->rdata.tkey_record.algorithm,
+                                             state->remote_address,
+                                             state->local_address,
                                              &tkey);
                        if (!NT_STATUS_IS_OK(status)) {
                                ret_tkey->rdata.tkey_record.error = DNS_RCODE_BADKEY;