]> git.meshlink.io Git - meshlink/commit
Merge local host configuration with server configuration.
authorGuus Sliepen <guus@tinc-vpn.org>
Fri, 22 Oct 2010 10:47:12 +0000 (12:47 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Fri, 22 Oct 2010 10:47:12 +0000 (12:47 +0200)
commitff71f289022ccb91abc2726f16522d55b5ccf0f6
tree08bccc2a0d3b1d3a062761669a756b073f00bb75
parent8c3105283ac53f8cc9cc4dde25957ec1cf6b53a0
Merge local host configuration with server configuration.

With some exceptions, tinc only accepted host configuration options for the
local node from the corresponding host configuration file. Although this is
documented, many people expect that they can also put those options in
tinc.conf. Tinc now internally merges the contents of both tinc.conf and the
local host configuration file.
doc/tinc.conf.5.in
doc/tinc.texi
src/net_setup.c
src/protocol_auth.c