aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2015-08-28 15:49:58 +0200
committerTobias Brunner <tobias@strongswan.org>2015-08-28 15:49:58 +0200
commit486d7b267186d7df83f61e72a9de8f4a8cf8a68f (patch)
tree47995f38bdec8e9594080d64a81a07d1910e17a8
parent592f31f5af23ec80a85eaede56aef5a2b5a9bb9e (diff)
downloadstrongswan-486d7b267186d7df83f61e72a9de8f4a8cf8a68f.tar.bz2
strongswan-486d7b267186d7df83f61e72a9de8f4a8cf8a68f.tar.xz
conf: Add documentation for new osx-attr option
-rw-r--r--conf/Makefile.am1
-rw-r--r--conf/plugins/osx-attr.opt3
2 files changed, 4 insertions, 0 deletions
diff --git a/conf/Makefile.am b/conf/Makefile.am
index e0952dd14..72d9f258d 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -72,6 +72,7 @@ plugins = \
plugins/lookip.opt \
plugins/ntru.opt \
plugins/openssl.opt \
+ plugins/osx-attr.opt \
plugins/pkcs11.opt \
plugins/radattr.opt \
plugins/random.opt \
diff --git a/conf/plugins/osx-attr.opt b/conf/plugins/osx-attr.opt
new file mode 100644
index 000000000..70bd19716
--- /dev/null
+++ b/conf/plugins/osx-attr.opt
@@ -0,0 +1,3 @@
+charon.plugins.osx-attr.append = yes
+ Whether DNS servers are appended to existing entries, instead of replacing
+ them.