aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/plugins/dhcp/dhcp_socket.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2012-04-24 14:10:06 +0200
committerTobias Brunner <tobias@strongswan.org>2012-05-03 13:57:04 +0200
commit42500c274a0858ee27fc5d54b02b90809f2ecd87 (patch)
treeb9e95d636311a08fc4639e73a4d12ab7273afc91 /src/libcharon/plugins/dhcp/dhcp_socket.c
parent18758e3d2ea173b798a827917e4f8a1f9c4bc9a2 (diff)
downloadstrongswan-42500c274a0858ee27fc5d54b02b90809f2ecd87.tar.bz2
strongswan-42500c274a0858ee27fc5d54b02b90809f2ecd87.tar.xz
Use name from initialization to access settings in libcharon.
Also fixes several whitespace errors.
Diffstat (limited to 'src/libcharon/plugins/dhcp/dhcp_socket.c')
-rw-r--r--src/libcharon/plugins/dhcp/dhcp_socket.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libcharon/plugins/dhcp/dhcp_socket.c b/src/libcharon/plugins/dhcp/dhcp_socket.c
index 5d98e5b8d..091d91c2d 100644
--- a/src/libcharon/plugins/dhcp/dhcp_socket.c
+++ b/src/libcharon/plugins/dhcp/dhcp_socket.c
@@ -704,10 +704,11 @@ dhcp_socket_t *dhcp_socket_create()
return NULL;
}
this->identity_lease = lib->settings->get_bool(lib->settings,
- "charon.plugins.dhcp.identity_lease", FALSE);
+ "%s.plugins.dhcp.identity_lease", FALSE,
+ charon->name);
this->dst = host_create_from_string(lib->settings->get_str(lib->settings,
- "charon.plugins.dhcp.server", "255.255.255.255"),
- DHCP_SERVER_PORT);
+ "%s.plugins.dhcp.server", "255.255.255.255",
+ charon->name), DHCP_SERVER_PORT);
if (!this->dst)
{
DBG1(DBG_CFG, "configured DHCP server address invalid");