From 7822caa94ad3b03f192bdad298b57f1bb2c50b4e Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 16 Jul 2007 13:11:06 +0000 Subject: fully integrated patch from mildew@gmail.com --- parse.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'parse.c') diff --git a/parse.c b/parse.c index 8bdb206b..900c4ef3 100644 --- a/parse.c +++ b/parse.c @@ -358,11 +358,12 @@ rsRetVal parsQuotedCStr(rsParsObj *pThis, rsCStrObj **ppCStr) * full hostname (e.g.: localhost.localdomain) or hostname wildcard * (e.g.: *.localdomain). */ +#ifdef SYSLOG_INET rsRetVal parsAddrWithBits(rsParsObj *pThis, struct NetAddr **pIP, int *pBits) { register unsigned char *pC; unsigned char *pszIP; - char *pszTmp; + uchar *pszTmp; struct addrinfo hints, *res = NULL; rsCStrObj *pCStr; rsRetVal iRet; @@ -447,7 +448,7 @@ rsRetVal parsAddrWithBits(rsParsObj *pThis, struct NetAddr **pIP, int *pBits) /* no slash, so we assume a single host (/128) */ *pBits = 128; } - } else { + } else { /* now parse IPv4 */ memset (&hints, 0, sizeof (struct addrinfo)); hints.ai_family = AF_INET; hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICHOST; @@ -494,6 +495,8 @@ rsRetVal parsAddrWithBits(rsParsObj *pThis, struct NetAddr **pIP, int *pBits) return RS_RET_OK; } +#endif /* #ifdef SYSLOG_INET */ + /* tell if the parsepointer is at the end of the * to-be-parsed string. Returns 1, if so, 0 -- cgit