libcharon: Use lib->ns instead of charon->name
This commit is contained in:
@@ -421,7 +421,7 @@ METHOD(task_t, process_r, status_t,
|
||||
case AUTH_PSK:
|
||||
if (!lib->settings->get_bool(lib->settings, "%s.i_dont_care"
|
||||
"_about_security_and_use_aggressive_mode_psk",
|
||||
FALSE, charon->name))
|
||||
FALSE, lib->ns))
|
||||
{
|
||||
DBG1(DBG_IKE, "Aggressive Mode PSK disabled for "
|
||||
"security reasons");
|
||||
|
||||
@@ -191,9 +191,9 @@ static void build(private_isakmp_vendor_t *this, message_t *message)
|
||||
int i;
|
||||
|
||||
strongswan = lib->settings->get_bool(lib->settings,
|
||||
"%s.send_vendor_id", FALSE, charon->name);
|
||||
"%s.send_vendor_id", FALSE, lib->ns);
|
||||
cisco_unity = lib->settings->get_bool(lib->settings,
|
||||
"%s.cisco_unity", FALSE, charon->name);
|
||||
"%s.cisco_unity", FALSE, lib->ns);
|
||||
ike_cfg = this->ike_sa->get_ike_cfg(this->ike_sa);
|
||||
fragmentation = ike_cfg->fragmentation(ike_cfg) != FRAGMENTATION_NO;
|
||||
if (!this->initiator && fragmentation)
|
||||
|
||||
@@ -194,7 +194,7 @@ static void schedule_inactivity_timeout(private_quick_mode_t *this)
|
||||
if (timeout)
|
||||
{
|
||||
close_ike = lib->settings->get_bool(lib->settings,
|
||||
"%s.inactivity_close_ike", FALSE, charon->name);
|
||||
"%s.inactivity_close_ike", FALSE, lib->ns);
|
||||
lib->scheduler->schedule_job(lib->scheduler, (job_t*)
|
||||
inactivity_job_create(this->child_sa->get_reqid(this->child_sa),
|
||||
timeout, close_ike), timeout);
|
||||
|
||||
Reference in New Issue
Block a user