--- mqtt/src/accmqtt.c	2011/11/24 01:13:27	1.1.2.4
+++ mqtt/src/accmqtt.c	2012/04/11 15:08:27	1.2.2.1
@@ -1,6 +1,9 @@
 #include "global.h"
 
 
+extern const char sql_schema[];
+
+
 /*
  * mqtt_rtlm_log() Log database connection message
  *
@@ -28,7 +31,7 @@ mqtt_rtlm_log(const char *fmt, ...)
  * return: NULL error or SQL handle
  */
 sqlite3 *
-mqtt_rtlm_open(sl_config *cfg)
+mqtt_rtlm_open(cfg_root_t *cfg)
 {
 	sqlite3 *sql = NULL;
 	const char *str = NULL;
@@ -36,18 +39,26 @@ mqtt_rtlm_open(sl_config *cfg)
 	if (!cfg)
 		return NULL;
 
-	str = (const char*) cfg_GetAttribute(cfg, CFG("mqtt_acc"), CFG("name"));
+	if (!sqlite3_threadsafe() || sqlite3_config(SQLITE_CONFIG_SERIALIZED))
+		return NULL;
+
+	str = (const char*) cfg_getAttribute(cfg, "mqtt_acc", "name");
 	if (!str) {
 		mqtt_rtlm_log("Error:: Unknown database name ...\n");
 		return NULL;
 	}
 
-	if (sqlite3_open_v2(str, &sql, SQLITE_OPEN_READONLY, NULL)) {
+	if (sqlite3_open_v2(str, &sql, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL)) {
 		MQTT_RTLM_LOG(sql);
 		sqlite3_close(sql);
 		return NULL;
 	}
 
+	if (sqlite3_exec(sql, sql_schema, NULL, NULL, NULL)) {
+		MQTT_RTLM_LOG(sql);
+		sqlite3_close(sql);
+		return NULL;
+	}
 	return sql;
 }
 
@@ -70,11 +81,10 @@ mqtt_rtlm_close(sqlite3 *sql)
  * @sql = SQL handle
  * @user = username
  * @pass = password
- * @... = arguments list
  * return: -1 error, 0 ALLOW and 1 REJECT
  */
 int
-mqtt_rtlm_login(sl_config *cfg, sqlite3 *sql, const char *user, const char *pass, ...)
+mqtt_rtlm_login(cfg_root_t *cfg, sqlite3 *sql, const char *user, const char *pass)
 {
 	/* insert into Users values (NULL, "", "", 1, strftime('%s','now')); */
 	int ret = 0;
@@ -84,7 +94,7 @@ mqtt_rtlm_login(sl_config *cfg, sqlite3 *sql, const ch
 	if (!sql)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_acc"), CFG("tbl_users"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_acc", "tbl_users");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found users table name");
 		return -1;