--- libaitcfg/src/queue.c	2012/07/25 15:24:20	1.9
+++ libaitcfg/src/queue.c	2012/09/19 15:22:32	1.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: queue.c,v 1.9 2012/07/25 15:24:20 misho Exp $
+* $Id: queue.c,v 1.11 2012/09/19 15:22:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -49,7 +49,7 @@ SUCH DAMAGE.
 static inline struct tagCfg *
 _selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr)
 {
-	struct tagCfg fav;
+	struct tagCfg fav, *c;
 
 	if (!cfg)
 		return NULL;
@@ -58,15 +58,23 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch
 
 	if (csSec && *csSec)
 		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
-				io_align(strlen(csSec), 1) / 2);
+				io_align(strlen(csSec), 2) / 2);
 	if (csAttr)
 		AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, 
-				io_align(strlen(csAttr), 1) / 2);
+				io_align(strlen(csAttr), 2) / 2);
 
 	if (!csAttr)
 		return RB_NFIND(tagRC, cfg, &fav);
-	else
-		return RB_FIND(tagRC, cfg, &fav);
+	else {
+		c = RB_FIND(tagRC, cfg, &fav);
+		if (!c)
+			return NULL;	/* not found */
+		do {
+			if (!strcmp(AIT_GET_STR(&c->cfg_attr), csAttr))
+				return c;	/* FOUND! */
+		} while (RB_NEXT(tagRC, cfg, c) && !cfg_tree_cmp(c, &fav));
+		return NULL;	/* not found */
+	}
 }
 
 /* --------------------------------------------------------------- */
@@ -93,10 +101,10 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c
 
 	if (csSec && *csSec)
 		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
-				io_align(strlen(csSec), 1) / 2);
+				io_align(strlen(csSec), 2) / 2);
 	if (csAttr)
 		AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, 
-				io_align(strlen(csAttr), 1) / 2);
+				io_align(strlen(csAttr), 2) / 2);
 
 	SLIST_FOREACH(av, cfg, cfg_next) {
 		++cx;
@@ -179,12 +187,12 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
 		if (csSec && *csSec) {
 			AIT_SET_STR(&av->cfg_sec, csSec);
 			AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), 
-					io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2);
+					io_align(AIT_LEN(&av->cfg_sec) - 1, 2) / 2);
 		}
 		AIT_SET_STR(&av->cfg_val, csVal ? csVal : "");
 		AIT_SET_STR(&av->cfg_attr, csAttr);
 		AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), 
-				io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2);
+				io_align(AIT_LEN(&av->cfg_attr) - 1, 2) / 2);
 
 		CFG_RC_LOCK(cfg);
 		RB_INSERT(tagRC, cfg, av);
@@ -192,7 +200,8 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
 		return 2;
 	}
 
-	if (csVal && strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) {
+	if (csVal && AIT_ADDR(&av->cfg_val) && 
+			strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) {
 		/* Update element */
 		AIT_FREE_VAL(&av->cfg_val);
 		AIT_SET_STR(&av->cfg_val, csVal);
@@ -260,7 +269,8 @@ cfg_loadAttribute(cfg_root_t * __restrict cfg, const c
 		return ret;
 	}
 
-	if (AIT_ISEMPTY(&av->cfg_val) || !*AIT_GET_LIKE(&av->cfg_val, char*)) {
+	if (AIT_ISEMPTY(&av->cfg_val) || !AIT_ADDR(&av->cfg_val) || 
+			!*AIT_GET_LIKE(&av->cfg_val, char*)) {
 		/* empty value */
 		if (csDefValue) {
 			AIT_SET_STR(val, csDefValue);