From ef46e12fd85efe4a29236984e8f8e729b4dd66cf Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 4 Jun 2019 11:49:37 +0200 Subject: [PATCH] Check syntax during configuration and add fix docs. --- pdns/rec-lua-conf.cc | 4 +++- pdns/recursordist/docs/lua-config/protobuf.rst | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pdns/rec-lua-conf.cc b/pdns/rec-lua-conf.cc index 04e2d9f673..1b7dfe6fdb 100644 --- a/pdns/rec-lua-conf.cc +++ b/pdns/rec-lua-conf.cc @@ -541,7 +541,9 @@ void loadRecursorLuaConfig(const std::string& fname, luaConfigDelayedThreads& de try { if (servers.type() == typeid(std::string)) { auto server = boost::get(servers); - + if (!boost::starts_with(server, "/")) { + ComboAddress parsecheck(server); + } lci.frameStreamExportConfig.servers.emplace_back(server); } else { diff --git a/pdns/recursordist/docs/lua-config/protobuf.rst b/pdns/recursordist/docs/lua-config/protobuf.rst index c3889c3bd0..bb35e44b24 100644 --- a/pdns/recursordist/docs/lua-config/protobuf.rst +++ b/pdns/recursordist/docs/lua-config/protobuf.rst @@ -103,11 +103,11 @@ The recursor must have been built with configure ``--enable-dnstap`` to make thi .. function:: dnstapFrameStreamServer(servers, [, options]) - .. versionadded:: 4.X.0 + .. versionadded:: 4.3.0 Send dnstap formatted message to one or more framestream servers for outgoing queries and/or incoming responses. - :param servers: The IP and port to connect to, or a list of those. If more than one server is configured, all messages are sent to every server. + :param servers: Either a pathname of a unix domain socket starting with a slash or the IP:port to connect to, or a list of those. If more than one server is configured, all messages are sent to every server. :type servers: string or list of strings :param table options: A table with ``key=value`` pairs with options. -- 2.39.2