From f0f0db1e65683c1ec44096692578bf1a5d652275 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 20 Apr 2010 16:16:28 +0200
Subject: fixed broken merge

---
 plugins/imsolaris/imsolaris.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'plugins/imsolaris/imsolaris.c')

diff --git a/plugins/imsolaris/imsolaris.c b/plugins/imsolaris/imsolaris.c
index 6b07ba2b..5933c91f 100644
--- a/plugins/imsolaris/imsolaris.c
+++ b/plugins/imsolaris/imsolaris.c
@@ -205,7 +205,6 @@ readLog(int fd, uchar *pRcv, int iMaxLine)
 		MsgSetHOSTNAME(pMsg, glbl.GetLocalHostName(), ustrlen(glbl.GetLocalHostName()));
 		pMsg->iFacility = LOG_FAC(hdr.pri);
 		pMsg->iSeverity = LOG_PRI(hdr.pri);
-		pMsg->bParseHOSTNAME = 0;
 		pMsg->msgFlags = NEEDS_PARSING | NO_PRI_IN_RAW;
 		CHKiRet(submitMsg(pMsg));
 	}
-- 
cgit v1.2.3