Use name from initialization to access settings in libcharon.

Also fixes several whitespace errors.

src/libcharon/sa/ikev1/tasks/isakmp_vendor.c

@@ -121,7 +121,7 @@ METHOD(task_t, build, status_t,
 	int i;
 
 	strongswan = lib->settings->get_bool(lib->settings,
-										 "charon.send_vendor_id", FALSE);
+									"%s.send_vendor_id", FALSE, charon->name);
 	for (i = 0; i < countof(vendor_ids); i++)
 	{
 		if (vendor_ids[i].send ||

src/libcharon/sa/ikev1/tasks/quick_mode.c

@@ -154,7 +154,7 @@ static void schedule_inactivity_timeout(private_quick_mode_t *this)
 	if (timeout)
 	{
 		close_ike = lib->settings->get_bool(lib->settings,
-										"charon.inactivity_close_ike", FALSE);
+								"%s.inactivity_close_ike", FALSE, charon->name);
 		lib->scheduler->schedule_job(lib->scheduler, (job_t*)
 				inactivity_job_create(this->child_sa->get_reqid(this->child_sa),
 									  timeout, close_ike), timeout);