diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-06-29 10:09:47 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-07-27 13:22:57 +0200 |
| commit | 4272a3e9d76d61e1468e9b3a124a01a35badcaac (patch) | |
| tree | 54070c0f081a1f12cd84e1254ef0542bae321e9a | |
| parent | ae48325a5973c347a907a5a0c869461e9560ad0a (diff) | |
| download | strongswan-4272a3e9d76d61e1468e9b3a124a01a35badcaac.tar.bz2 strongswan-4272a3e9d76d61e1468e9b3a124a01a35badcaac.tar.xz | |
swanctl: Read default socket from swanctl.socket option
Also read from swanctl.plugins.vici.socket so we get
libstrongswan.plugins.vici.socket if it is defined.
Fixes #2372.
| -rw-r--r-- | conf/options/swanctl.opt | 5 | ||||
| -rw-r--r-- | src/swanctl/command.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/conf/options/swanctl.opt b/conf/options/swanctl.opt index f78b4bccc..f2a8a0ff7 100644 --- a/conf/options/swanctl.opt +++ b/conf/options/swanctl.opt @@ -1,2 +1,5 @@ swanctl.load = - Plugins to load in swanctl.
\ No newline at end of file + Plugins to load in swanctl. + +swanctl.socket = unix://${piddir}/charon.vici + VICI socket to connect to by default. diff --git a/src/swanctl/command.c b/src/swanctl/command.c index fd9bc0083..7f65d2b0e 100644 --- a/src/swanctl/command.c +++ b/src/swanctl/command.c @@ -315,6 +315,10 @@ int command_dispatch(int c, char *v[]) { int op, i; + uri = lib->settings->get_str(lib->settings, "%s.socket", + lib->settings->get_str(lib->settings, "%s.plugins.vici.socket", + NULL, lib->ns), lib->ns); + options = options_create(); atexit(cleanup); active = help_idx = registered; |