--- mqtt/src/pubmqtt.c	2011/12/16 02:09:20	1.1.2.17
+++ mqtt/src/pubmqtt.c	2012/01/27 15:18:12	1.2.2.1
@@ -160,7 +160,7 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
 		return -1;
 	}
 	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE ConnID = '%s' AND Username = '%s' "
-			"AND RemoteHost LIKE '%s';", str, user, connid, host);
+			"AND RemoteHost LIKE '%s';", str, connid, user, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -390,10 +390,10 @@ mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, u_s
 	/* fill with data */
 	for (j = 0; j < rowz && sqlite3_step(stmt) == SQLITE_ROW; j++) {
 		s[j].sub_ret = (char) sqlite3_column_int(stmt, 0);
-		s[j].sub_topic._base = (u_char*) strdup((char*) sqlite3_column_text(stmt, 1));
-		s[j].sub_topic._size = strlen((char*) s[j].sub_topic._base);
-		s[j].sub_value._base = (u_char*) strdup((char*) sqlite3_column_text(stmt, 2));
-		s[j].sub_value._size = strlen((char*) s[j].sub_value._base);
+		s[j].sub_topic.msg_base = (u_char*) strdup((char*) sqlite3_column_text(stmt, 1));
+		s[j].sub_topic.msg_len = strlen((char*) s[j].sub_topic.msg_base);
+		s[j].sub_value.msg_base = (u_char*) strdup((char*) sqlite3_column_text(stmt, 2));
+		s[j].sub_value.msg_len = strlen((char*) s[j].sub_value.msg_base);
 	}
 end:
 	sqlite3_finalize(stmt);