From ae48325a5973c347a907a5a0c869461e9560ad0a Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 29 Jun 2017 09:32:25 +0200
Subject: [PATCH] swanctl: Include config snippets from conf.d subdirectory

Fixes #2371.
---
 src/swanctl/Makefile.am | 1 +
 src/swanctl/swanctl.opt | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/swanctl/Makefile.am b/src/swanctl/Makefile.am
index 2fc9982..19815c5 100644
--- a/src/swanctl/Makefile.am
+++ b/src/swanctl/Makefile.am
@@ -64,6 +64,7 @@ maintainer-clean-local:
 
 install-data-local: swanctl.conf
 	test -e "$(DESTDIR)$(swanctldir)" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)" || true
+	test -e "$(DESTDIR)$(swanctldir)/conf.d" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/conf.d" || true
 	test -e "$(DESTDIR)$(swanctldir)/x509" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509" || true
 	test -e "$(DESTDIR)$(swanctldir)/x509ca" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509ca" || true
 	test -e "$(DESTDIR)$(swanctldir)/x509aa" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509aa" || true
diff --git a/src/swanctl/swanctl.opt b/src/swanctl/swanctl.opt
index a36e837..634271d 100644
--- a/src/swanctl/swanctl.opt
+++ b/src/swanctl/swanctl.opt
@@ -1158,3 +1158,5 @@ authorities.<name>.cert_uri_base =
 	built by appending the SHA1 hash of the DER encoded certificates to this
 	base URI.
 
+include conf.d/*.conf
+	Include config snippets
-- 
2.7.4