--- mqtt/src/mqttd.c	2012/04/24 13:54:50	1.2.2.6
+++ mqtt/src/mqttd.c	2012/05/05 14:51:02	1.2.2.7
@@ -12,7 +12,6 @@ sessions_t Sessions;
 pubs_t Pubs;
 sched_root_task_t *root;
 sqlite3 *acc, *pub;
-pthread_mutex_t mtx_sess, mtx_pub;
 FILE *logg;
 extern char compiled[], compiledby[], compilehost[];
 static char szCfgName[MAXPATHLEN];
@@ -35,7 +34,6 @@ static void
 sigHand(int sig)
 {
 	int stat;
-	struct tagSession *sess;
 
 	switch (sig) {
 		case SIGHUP:
@@ -49,12 +47,6 @@ sigHand(int sig)
 		case SIGTERM:
 			ioDEBUG(1, "Terminate MQTT service in progress");
 			Kill++;
-
-			SESS_LOCK;
-			TAILQ_FOREACH(sess, &Sessions, sess_node)
-				if (sess->sess_tid)
-					pthread_cancel(sess->sess_tid);
-			SESS_UNLOCK;
 			break;
 		case SIGCHLD:
 			while (waitpid(-1, &stat, WNOHANG) > 0);
@@ -102,8 +94,6 @@ main(int argc, char **argv)
 		printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());
 		return 1;
 	}
-	pthread_mutex_init(&mtx_sess, NULL);
-	pthread_mutex_init(&mtx_pub, NULL);
 	openlog("mqttd", LOG_PID | LOG_CONS, LOG_DAEMON);
 	/* load 3 plugins */
 	for (i = 0; i < 3; i++)
@@ -113,8 +103,6 @@ main(int argc, char **argv)
 				mqttUnloadRTLM(i);
 			cfgUnloadConfig(&cfg);
 			closelog();
-			pthread_mutex_destroy(&mtx_pub);
-			pthread_mutex_destroy(&mtx_sess);
 			return 2;
 		}
 	acc = call.OpenACC(&cfg);
@@ -208,7 +196,5 @@ end:	/* free all resources */
 		mqttUnloadRTLM(i);
 	closelog();
 	cfgUnloadConfig(&cfg);
-	pthread_mutex_destroy(&mtx_pub);
-	pthread_mutex_destroy(&mtx_sess);
 	return ret;
 }