libcharon: Use lib->ns instead of charon->name

This commit is contained in:
Tobias Brunner
2014-02-12 14:34:32 +01:00
parent 10c4f4e1fd
commit d223fe807a
72 changed files with 255 additions and 259 deletions
+3 -4
View File
@@ -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))
{
@@ -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;
@@ -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(),
);