X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=src%2Fmedsrv%2Fmain.c;h=d66d01ecfb5f8fd8092016153e7fe5b2905d9e53;hp=00975e93a10c93cf85f4c62bcc1e707fb388743f;hb=872176d350d16d6c6785f11ec366de3b13efcf74;hpb=9529fb68360212da5ef49cf30495fb8c1318aa4e;ds=sidebyside

diff --git a/src/medsrv/main.c b/src/medsrv/main.c
index 00975e9..d66d01e 100644
--- a/src/medsrv/main.c
+++ b/src/medsrv/main.c
@@ -12,8 +12,6 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
- *
- * $Id$
  */
 
 #include <stdio.h>
@@ -34,14 +32,17 @@ int main(int arc, char *argv[])
 	bool debug;
 	char *uri;
 	int timeout, threads;
-	
+
 	library_init(STRONGSWAN_CONF);
-	lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR,
-	    lib->settings->get_str(lib->settings, "medsrv.load", PLUGINS));
-	
+	if (!lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR,
+			lib->settings->get_str(lib->settings, "medsrv.load", PLUGINS)))
+	{
+		return 1;
+	}
+
 	socket = lib->settings->get_str(lib->settings, "medsrv.socket", NULL);
 	debug = lib->settings->get_bool(lib->settings, "medsrv.debug", FALSE);
-	timeout = lib->settings->get_int(lib->settings, "medsrv.timeout", 900);
+	timeout = lib->settings->get_time(lib->settings, "medsrv.timeout", 900);
 	threads = lib->settings->get_int(lib->settings, "medsrv.threads", 5);
 	uri = lib->settings->get_str(lib->settings, "medsrv.database", NULL);
 	if (uri == NULL)
@@ -49,14 +50,14 @@ int main(int arc, char *argv[])
 		fprintf(stderr, "database URI medsrv.database not defined.\n");
 		return 1;
 	}
-	
+
 	db = lib->db->create(lib->db, uri);
 	if (db == NULL)
 	{
 		fprintf(stderr, "opening database failed.\n");
 		return 1;
 	}
-	
+
 	dispatcher = dispatcher_create(socket, debug, timeout,
 								   (context_constructor_t)user_create, db);
 	dispatcher->add_filter(dispatcher,
@@ -65,13 +66,13 @@ int main(int arc, char *argv[])
 						(controller_constructor_t)user_controller_create, db);
 	dispatcher->add_controller(dispatcher,
 						(controller_constructor_t)peer_controller_create, db);
-	
+
 	dispatcher->run(dispatcher, threads);
-	
+
 	dispatcher->waitsignal(dispatcher);
 	dispatcher->destroy(dispatcher);
 	db->destroy(db);
-	
+
 	library_deinit();
 	return 0;
 }