--- mqtt/src/mqttd.c	2012/05/05 14:51:02	1.2.2.7
+++ mqtt/src/mqttd.c	2012/07/03 09:02:50	1.3
@@ -9,7 +9,6 @@ io_enableDEBUG;
 
 cfg_root_t cfg;
 sessions_t Sessions;
-pubs_t Pubs;
 sched_root_task_t *root;
 sqlite3 *acc, *pub;
 FILE *logg;
@@ -44,6 +43,7 @@ sigHand(int sig)
 			}
 
 			ioLIBERR(cfg);
+		case SIGINT:
 		case SIGTERM:
 			ioDEBUG(1, "Terminate MQTT service in progress");
 			Kill++;
@@ -68,7 +68,6 @@ main(int argc, char **argv)
 	ait_val_t v;
 
 	TAILQ_INIT(&Sessions);
-	TAILQ_INIT(&Pubs);
 
 	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
 	while ((ch = getopt(argc, argv, "hvbc:")) != -1)
@@ -99,8 +98,9 @@ main(int argc, char **argv)
 	for (i = 0; i < 3; i++)
 		if (!mqttLoadRTLM(&cfg, i)) {
 			printf("Error:: Can't load RTL module\n");
-			while (i--)
-				mqttUnloadRTLM(i);
+			mqttUnloadRTLM(acc);
+			mqttUnloadRTLM(pub);
+			mqttUnloadRTLM(logg);
 			cfgUnloadConfig(&cfg);
 			closelog();
 			return 2;
@@ -121,6 +121,7 @@ main(int argc, char **argv)
 		goto end;
 	}
 
+
 	if (mqttMkDir(&cfg)) {
 		printf("Error:: in statedir #%d - %s\n", errno, strerror(errno));
 		ret = 3;
@@ -158,6 +159,7 @@ main(int argc, char **argv)
 	sigemptyset(&sa.sa_mask);
 	sa.sa_handler = sigHand;
 	sigaction(SIGHUP, &sa, NULL);
+	sigaction(SIGINT, &sa, NULL);
 	sigaction(SIGTERM, &sa, NULL);
 	sigaction(SIGCHLD, &sa, NULL);
 	sigaction(SIGPIPE, &sa, NULL);
@@ -192,9 +194,10 @@ end:	/* free all resources */
 	call.CloseLOG(logg);
 	call.ClosePUB(pub);
 	call.CloseACC(acc);
-	for (i = 0; i < 3; i++)
-		mqttUnloadRTLM(i);
-	closelog();
+	mqttUnloadRTLM(acc);
+	mqttUnloadRTLM(pub);
+	mqttUnloadRTLM(logg);
 	cfgUnloadConfig(&cfg);
+	closelog();
 	return ret;
 }