mqtt/src/accmqtt.c - diff

Return to accmqtt.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/accmqtt.c between versions 1.2.2.3 and 1.2.2.4

version 1.2.2.3, 2012/04/25 12:04:30	version 1.2.2.4, 2012/05/05 14:51:01
Line 40 mqtt_rtlm_open(cfg_root_t *cfg)	Line 40 mqtt_rtlm_open(cfg_root_t *cfg)
if (!cfg)	if (!cfg)
return NULL;	return NULL;

sqlite3_config(SQLITE_CONFIG_SERIALIZED);
if (!sqlite3_threadsafe())
return NULL;

str = (const char*) cfg_getAttribute(cfg, "mqtt_acc", "name");	str = (const char*) cfg_getAttribute(cfg, "mqtt_acc", "name");
if (!str) {	if (!str) {
mqtt_rtlm_log("Error:: Unknown database name ...\n");	mqtt_rtlm_log("Error:: Unknown database name ...\n");
Line 56 mqtt_rtlm_open(cfg_root_t *cfg)	Line 52 mqtt_rtlm_open(cfg_root_t *cfg)
return NULL;	return NULL;
}	}

sqlite3_mutex_enter(sqlite3_db_mutex(sql));
if (sqlite3_exec(sql, sql_schema, NULL, NULL, NULL)) {	if (sqlite3_exec(sql, sql_schema, NULL, NULL, NULL)) {
MQTT_RTLM_LOG(sql);	MQTT_RTLM_LOG(sql);
sqlite3_mutex_leave(sqlite3_db_mutex(sql));
sqlite3_close(sql);	sqlite3_close(sql);
return NULL;	return NULL;
}	}
sqlite3_mutex_leave(sqlite3_db_mutex(sql));
return sql;	return sql;
}	}

Line 107 mqtt_rtlm_login(cfg_root_t cfg, sqlite3 sql, const c	Line 101 mqtt_rtlm_login(cfg_root_t cfg, sqlite3 sql, const c
snprintf(szStmt, sizeof szStmt, "SELECT DISTINCT Username, Password, Access FROM %s "	snprintf(szStmt, sizeof szStmt, "SELECT DISTINCT Username, Password, Access FROM %s "
"WHERE Username = '%s' AND Password = '%s' AND Access > 0;", str, user, pass);	"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)) {	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
MQTT_RTLM_LOG(sql);	MQTT_RTLM_LOG(sql);
sqlite3_mutex_leave(sqlite3_db_mutex(sql));
return -1;	return -1;
}	}
while (sqlite3_step(stmt) == SQLITE_ROW) {	while (sqlite3_step(stmt) == SQLITE_ROW) {
Line 121 mqtt_rtlm_login(cfg_root_t cfg, sqlite3 sql, const c	Line 113 mqtt_rtlm_login(cfg_root_t cfg, sqlite3 sql, const c
break;	break;
}	}
sqlite3_finalize(stmt);	sqlite3_finalize(stmt);
sqlite3_mutex_leave(sqlite3_db_mutex(sql));

return ret;	return ret;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.2.2.3
changed lines
	Added in v.1.2.2.4