--- mqtt/src/accmqtt.c	2012/04/11 15:08:27	1.2.2.1
+++ mqtt/src/accmqtt.c	2012/04/25 12:04:30	1.2.2.3
@@ -20,7 +20,8 @@ mqtt_rtlm_log(const char *fmt, ...)
 	vsyslog(LOG_ERR, fmt, lst);
 	va_end(lst);
 }
-#define MQTT_RTLM_LOG(_sql)	(assert((_sql)), mqtt_rtlm_log("Error:: SQL #%d - %s", \
+#define MQTT_RTLM_LOG(_sql)	(assert((_sql)), mqtt_rtlm_log("Error:: %s(%d) SQL #%d - %s", \
+					__func__, __LINE__, \
 					sqlite3_errcode((_sql)), sqlite3_errmsg((_sql))))
 
 
@@ -39,7 +40,8 @@ mqtt_rtlm_open(cfg_root_t *cfg)
 	if (!cfg)
 		return NULL;
 
-	if (!sqlite3_threadsafe() || sqlite3_config(SQLITE_CONFIG_SERIALIZED))
+	sqlite3_config(SQLITE_CONFIG_SERIALIZED);
+	if (!sqlite3_threadsafe())
 		return NULL;
 
 	str = (const char*) cfg_getAttribute(cfg, "mqtt_acc", "name");
@@ -54,11 +56,14 @@ mqtt_rtlm_open(cfg_root_t *cfg)
 		return NULL;
 	}
 
+	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_exec(sql, sql_schema, NULL, NULL, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		sqlite3_close(sql);
 		return NULL;
 	}
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 	return sql;
 }
 
@@ -102,8 +107,10 @@ mqtt_rtlm_login(cfg_root_t *cfg, sqlite3 *sql, const c
 	snprintf(szStmt, sizeof szStmt, "SELECT DISTINCT Username, Password, Access FROM %s "
 			"WHERE Username = '%s' AND Password = '%s' AND Access > 0;", str, user, pass);
 
+	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return -1;
 	}
 	while (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -114,6 +121,7 @@ mqtt_rtlm_login(cfg_root_t *cfg, sqlite3 *sql, const c
 		break;
 	}
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }