--- mqtt/src/mqttd_calls.c	2012/06/26 14:51:33	1.2.2.28
+++ mqtt/src/mqttd_calls.c	2012/06/29 13:46:37	1.2.2.30
@@ -60,14 +60,15 @@ pubOnce(struct tagSession *sess, char * __restrict psT
 {
 	ait_val_t *p = NULL;
 	struct tagSession *s = NULL;
-	struct tagStore *st = NULL;
+	struct tagStore *st_, *st = NULL;
 	regex_t re;
 	regmatch_t match;
 	int ret;
 	char szStr[STRSIZ];
 
+
 	TAILQ_FOREACH(s, &Sessions, sess_node) {
-		SLIST_FOREACH(st, &s->sess_subscr, st_node) {
+		SLIST_FOREACH_SAFE(st, &s->sess_subscr, st_node, st_) {
 			if ((ret = regcomp(&re, st->st_subscr.sub_topic.msg_base, REG_EXTENDED))) {
 				regerror(ret, &re, szStr, sizeof szStr);
 				regfree(&re);
@@ -92,7 +93,7 @@ pubAck(struct tagSession *sess, u_short mid, char * __
 {
 	ait_val_t *p = NULL;
 	struct tagSession *s = NULL;
-	struct tagStore *st = NULL;
+	struct tagStore *st_, *st = NULL;
 	regex_t re;
 	regmatch_t match;
 	int ret;
@@ -109,7 +110,7 @@ pubAck(struct tagSession *sess, u_short mid, char * __
 			sess->sess_user, sess->sess_addr, hdr->mqtt_msg.qos, hdr->mqtt_msg.retain);
 
 	TAILQ_FOREACH(s, &Sessions, sess_node) {
-		SLIST_FOREACH(st, &s->sess_subscr, st_node) {
+		SLIST_FOREACH_SAFE(st, &s->sess_subscr, st_node, st_) {
 			/* check for QoS */
 			if (st->st_subscr.sub_ret < MQTT_QOS_ACK)
 				continue;
@@ -143,7 +144,7 @@ pubExactly(struct tagSession *sess, u_short mid, char 
 {
 	ait_val_t *p = NULL;
 	struct tagSession *s = NULL;
-	struct tagStore *st = NULL;
+	struct tagStore *st_, *st = NULL;
 	regex_t re;
 	regmatch_t match;
 	int ret;
@@ -160,7 +161,7 @@ pubExactly(struct tagSession *sess, u_short mid, char 
 			sess->sess_user, sess->sess_addr, hdr->mqtt_msg.qos, hdr->mqtt_msg.retain);
 
 	TAILQ_FOREACH(s, &Sessions, sess_node) {
-		SLIST_FOREACH(st, &s->sess_subscr, st_node) {
+		SLIST_FOREACH_SAFE(st, &s->sess_subscr, st_node, st_) {
 			/* check for QoS */
 			if (st->st_subscr.sub_ret < MQTT_QOS_EXACTLY)
 				continue;
@@ -262,17 +263,18 @@ cmdPUBREL(void *srv, int len, void *arg)
 		return 0;
 	}
 
-	// TODO:: Delete from database topic
+	/* delete not retain message */
+	call.DeletePUB_topic(&cfg, pub, sess->sess_cid, mid, "%", sess->sess_user, 
+			sess->sess_addr, 0);
 
 	siz = mqtt_msgPUBCOMP(sess->sess_buf, mid);
 	if (siz == -1) {
 		ioDEBUG(5, "Error:: in msgPUBCOMP #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		return 0;
-	} else {
-		p = mkPkt(sess->sess_buf->msg_base, siz);
-		memset(sess->sess_buf->msg_base, 0, sess->sess_buf->msg_len);
 	}
 
+	p = mkPkt(sess->sess_buf->msg_base, siz);
+	memset(sess->sess_buf->msg_base, 0, sess->sess_buf->msg_len);
 	schedWrite(root, sendPacket, p, sess->sess_sock, NULL, 0);
 	return 0;
 }