Merge branch 'v2-stable' into debian_lenny

Conflicts:
	configure.ac
	doc/manual.html

1 files changed, 2 insertions, 0 deletions

diff --git a/msg.c b/msg.c
index 2261593a..324383d3 100644
--- a/msg.c
+++ b/msg.c
@@ -1389,6 +1389,8 @@ void MsgAssignHOSTNAME(msg_t *pMsg, char *pBuf)
 {
 	assert(pMsg != NULL);
 	assert(pBuf != NULL);
+	if(pMsg->pszHOSTNAME != NULL)
+		free(pMsg->pszHOSTNAME);
 	pMsg->iLenHOSTNAME = strlen(pBuf);
 	pMsg->pszHOSTNAME = (uchar*) pBuf;
 }