diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-03-26 15:09:21 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-03-27 10:44:21 +0200 |
| commit | ed2cab08d24e0a2ef6d49ec59b1823b0e05033d2 (patch) | |
| tree | 7d8661f606539ea767b4c8b1f300ac1d73009ab4 /src/libhydra/plugins/resolve/resolve_handler.c | |
| parent | caae5a5c0f8f417b95e112774cc6356c0867d98c (diff) | |
| download | strongswan-ed2cab08d24e0a2ef6d49ec59b1823b0e05033d2.tar.bz2 strongswan-ed2cab08d24e0a2ef6d49ec59b1823b0e05033d2.tar.xz | |
Make resolvconf interface prefix configurable.
Diffstat (limited to 'src/libhydra/plugins/resolve/resolve_handler.c')
| -rw-r--r-- | src/libhydra/plugins/resolve/resolve_handler.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/libhydra/plugins/resolve/resolve_handler.c b/src/libhydra/plugins/resolve/resolve_handler.c index 18e46f196..011ebbaaf 100644 --- a/src/libhydra/plugins/resolve/resolve_handler.c +++ b/src/libhydra/plugins/resolve/resolve_handler.c @@ -27,7 +27,7 @@ /* path to resolvconf executable */ #define RESOLVCONF_EXEC "/sbin/resolvconf" -/* prefix used for resolvconf interfaces */ +/* default prefix used for resolvconf interfaces (should have high prio) */ #define RESOLVCONF_PREFIX "lo.inet.ipsec." typedef struct private_resolve_handler_t private_resolve_handler_t; @@ -53,6 +53,11 @@ struct private_resolve_handler_t { bool use_resolvconf; /** + * prefix to be used for interface names sent to resolvconf + */ + char *iface_prefix; + + /** * Mutex to access file exclusively */ mutex_t *mutex; @@ -149,7 +154,7 @@ static bool invoke_resolvconf(private_resolve_handler_t *this, /* we use the nameserver's IP address as part of the interface name to * make them unique */ if (snprintf(cmd, sizeof(cmd), "%s %s %s%H", RESOLVCONF_EXEC, - install ? "-a" : "-d", RESOLVCONF_PREFIX, addr) >= sizeof(cmd)) + install ? "-a" : "-d", this->iface_prefix, addr) >= sizeof(cmd)) { return FALSE; } @@ -336,6 +341,9 @@ resolve_handler_t *resolve_handler_create() if (stat(RESOLVCONF_EXEC, &st) == 0) { this->use_resolvconf = TRUE; + this->iface_prefix = lib->settings->get_str(lib->settings, + "%s.plugins.resolve.resolvconf.iface_prefix", + RESOLVCONF_PREFIX, hydra->daemon); } return &this->public; |