]> granicus.if.org Git - pdns/commitdiff
Merge pull request #6220 from pieterlexis/ddist-xpf
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 23 Jan 2018 11:41:27 +0000 (12:41 +0100)
committerGitHub <noreply@github.com>
Tue, 23 Jan 2018 11:41:27 +0000 (12:41 +0100)
Add XPF support

1  2 
pdns/dnsdist-tcp.cc
pdns/dnsdist.cc
pdns/dnsdist.hh
pdns/dnsdistdist/docs/reference/config.rst
pdns/pdns_recursor.cc

Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
index 8765c52bd9b66badce1ea9eacade865c456b958e,bf2dbe77903f6a56c6ecf985025b26337a245dd6..e397c15db32da7438c2ea00482111226be0f1cd9
@@@ -260,10 -260,10 +260,10 @@@ Server
        checkName=STRING,      -- Use STRING as QNAME in the health-check query, default: "a.root-servers.net."
        checkType=STRING,      -- Use STRING as QTYPE in the health-check query, default: "A"
        setCD=BOOL,            -- Set the CD (Checking Disabled) flag in the health-check query, default: false
 -      maxCheckFailures=NUM,  -- Allow NUM check failures before declaring the backend down, default: false
 +      maxCheckFailures=NUM,  -- Allow NUM check failures before declaring the backend down, default: 1
        mustResolve=BOOL,      -- Set to true when the health check MUST return a NOERROR RCODE and an answer
        useClientSubnet=BOOL,  -- Add the client's IP address in the EDNS Client Subnet option when forwarding the query to this backend
-       source=STRING          -- The source address or interface to use for queries to this backend, by default this is left to the kernel's address selection
+       source=STRING,         -- The source address or interface to use for queries to this backend, by default this is left to the kernel's address selection
                               -- The following formats are supported:
                               --   "address", e.g. "192.0.2.2"
                               --   "interface name", e.g. "eth0"
Simple merge