--- libaitsess/src/sess.c	2008/09/30 20:19:48	1.1.1.1.2.1
+++ libaitsess/src/sess.c	2010/08/26 07:15:57	1.1.1.1.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: sess.c,v 1.1.1.1.2.1 2008/09/30 20:19:48 misho Exp $
+* $Id: sess.c,v 1.1.1.1.2.3 2010/08/26 07:15:57 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -43,14 +43,14 @@ int sess_GetValue(tagSess * __restrict s, const char *
 	} else
 		memcpy(Shared, s->addr, s->eom);
 
-	for (i = 1, peer = strtok_r(Shared, ":\r\n", &p_brk); peer; 
-			i++, peer = strtok_r(NULL, ":\r\n", &p_brk)) {
+	for (i = 1, peer = strtok_r(Shared, MEM_DELIM"\r\n", &p_brk); peer; 
+			i++, peer = strtok_r(NULL, MEM_DELIM"\r\n", &p_brk)) {
 		attr = strtok_r(peer, "=\r\n", &a_brk);
 		if (attr && !strncmp(attr, csAttr, MAX_ATTRIBUTE)) {
 			val = strtok_r(NULL, "=\r\n", &a_brk);
 			if (val && strlen(val)) {
 				if (psVal)
-					strncpy(psVal, val, *pnLen);
+					strlcpy(psVal, val, *pnLen);
 				if (pnLen)
 					*pnLen = strlen(val);
 			} else
@@ -103,15 +103,15 @@ int sess_DelValue(tagSess * __restrict s, const char *
 		memcpy(Shared, s->addr, s->eom);
 	}
 
-	for (i = 1, peer = strtok_r(Shared, ":\r\n", &p_brk); peer; 
-			i++, peer = strtok_r(NULL, ":\r\n", &p_brk)) {
+	for (i = 1, peer = strtok_r(Shared, MEM_DELIM"\r\n", &p_brk); peer; 
+			i++, peer = strtok_r(NULL, MEM_DELIM"\r\n", &p_brk)) {
 		if (!strncmp(peer, csAttr, attrlen))
-			if (peer[attrlen] == '=' || peer[attrlen] == ':' || !peer[attrlen] ||
+			if (peer[attrlen] == '=' || peer[attrlen] == *MEM_DELIM || !peer[attrlen] ||
 					peer[attrlen] == '\r' || peer[attrlen] == '\n')
 				continue;
 
 		strcat(Buffer, peer);
-		strcat(Buffer, "\n");
+		strcat(Buffer, MEM_DELIM);
 	}
 
 	memset(s->addr, 0, s->eom);
@@ -165,34 +165,34 @@ int sess_SetValue(tagSess * __restrict s, const char *
 		memcpy(Shared, s->addr, s->eom);
 	}
 
-	for (i = 1, upd = 0, peer = strtok_r(Shared, ":\r\n", &p_brk); peer; 
-			i++, peer = strtok_r(NULL, ":\r\n", &p_brk)) {
+	for (i = 1, upd = 0, peer = strtok_r(Shared, MEM_DELIM"\r\n", &p_brk); peer; 
+			i++, peer = strtok_r(NULL, MEM_DELIM"\r\n", &p_brk)) {
 		if (!strncmp(peer, szAttr, strlen(szAttr))) {
 			upd++;
 			if (psVal) {
 				strcat(Buffer, szAttr);
 				strcat(Buffer, psVal);
-				strcat(Buffer, "\n");
+				strcat(Buffer, MEM_DELIM);
 			} else {
 				strcat(Buffer, csAttr);
-				strcat(Buffer, "\n");
+				strcat(Buffer, MEM_DELIM);
 				def = IS_DEF;
 			}
 			continue;
 		}
 
 		strcat(Buffer, peer);
-		strcat(Buffer, "\n");
+		strcat(Buffer, MEM_DELIM);
 	}
 
 	if (!upd) {
 		if (psVal) {
 			strcat(Buffer, szAttr);
 			strcat(Buffer, psVal);
-			strcat(Buffer, "\n");
+			strcat(Buffer, MEM_DELIM);
 		} else {
 			strcat(Buffer, csAttr);
-			strcat(Buffer, "\n");
+			strcat(Buffer, MEM_DELIM);
 			def = IS_DEF;
 		}
 		def |= IS_ADD;