diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-01-22 15:18:58 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-02-12 14:34:32 +0100 |
| commit | d223fe807a0a7fe6f358420256d11d407f7c9f07 (patch) | |
| tree | 4c9edc8328a3d8b062bf423847b9ba2f3f2879c7 /src/libcharon/plugins/xauth_pam | |
| parent | 10c4f4e1fd572d731aaf0c456dfa9dcd7894a554 (diff) | |
| download | strongswan-d223fe807a0a7fe6f358420256d11d407f7c9f07.tar.bz2 strongswan-d223fe807a0a7fe6f358420256d11d407f7c9f07.tar.xz | |
libcharon: Use lib->ns instead of charon->name
Diffstat (limited to 'src/libcharon/plugins/xauth_pam')
| -rw-r--r-- | src/libcharon/plugins/xauth_pam/xauth_pam.c | 7 | ||||
| -rw-r--r-- | src/libcharon/plugins/xauth_pam/xauth_pam_listener.c | 4 | ||||
| -rw-r--r-- | src/libcharon/plugins/xauth_pam/xauth_pam_plugin.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/libcharon/plugins/xauth_pam/xauth_pam.c b/src/libcharon/plugins/xauth_pam/xauth_pam.c index 99fda7dad..71c79ecc0 100644 --- a/src/libcharon/plugins/xauth_pam/xauth_pam.c +++ b/src/libcharon/plugins/xauth_pam/xauth_pam.c @@ -142,7 +142,7 @@ METHOD(xauth_method_t, process, status_t, /* trim to username part if email address given */ if (lib->settings->get_bool(lib->settings, "%s.plugins.xauth-pam.trim_email", - TRUE, charon->name)) + TRUE, lib->ns)) { pos = memchr(chunk.ptr, '@', chunk.len); if (pos) @@ -175,9 +175,8 @@ METHOD(xauth_method_t, process, status_t, service = lib->settings->get_str(lib->settings, "%s.plugins.xauth-pam.pam_service", lib->settings->get_str(lib->settings, - "%s.plugins.eap-gtc.pam_service", - "login", charon->name), - charon->name); + "%s.plugins.eap-gtc.pam_service", "login", lib->ns), + lib->ns); if (authenticate(service, user, pass)) { diff --git a/src/libcharon/plugins/xauth_pam/xauth_pam_listener.c b/src/libcharon/plugins/xauth_pam/xauth_pam_listener.c index 1b9c045c7..eb06f54bb 100644 --- a/src/libcharon/plugins/xauth_pam/xauth_pam_listener.c +++ b/src/libcharon/plugins/xauth_pam/xauth_pam_listener.c @@ -136,8 +136,8 @@ xauth_pam_listener_t *xauth_pam_listener_create() "%s.plugins.xauth-pam.pam_service", lib->settings->get_str(lib->settings, "%s.plugins.eap-gtc.pam_service", - "login", charon->name), - charon->name), + "login", lib->ns), + lib->ns), ); return &this->public; diff --git a/src/libcharon/plugins/xauth_pam/xauth_pam_plugin.c b/src/libcharon/plugins/xauth_pam/xauth_pam_plugin.c index f70f30ef3..497ad3dd9 100644 --- a/src/libcharon/plugins/xauth_pam/xauth_pam_plugin.c +++ b/src/libcharon/plugins/xauth_pam/xauth_pam_plugin.c @@ -116,7 +116,7 @@ plugin_t *xauth_pam_plugin_create() }, }, .session = lib->settings->get_str(lib->settings, - "%s.plugins.xauth-pam.session", FALSE, charon->name), + "%s.plugins.xauth-pam.session", FALSE, lib->ns), .listener = xauth_pam_listener_create(), ); |