@@ -240,6 +240,9 @@

 /* Define to 1 if you have the <stdlib.h> header file. */

 #undef HAVE_STDLIB_H

+/* Define to 1 if you have the `strcasestr' function. */

+#undef HAVE_STRCASESTR

+

 /* Define to 1 if you have the `strerror_r' function. */

 #undef HAVE_STRERROR_R

@@ -21191,7 +21191,8 @@ fi

-for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat inet_ntop setgroups initgroups ctime_r mkstemp

+

+for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp

 do

 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

 { echo "$as_me:$LINENO: checking for $ac_func" >&5

@@ -210,7 +210,7 @@ AC_CHECK_LIB(nsl, gethostent, [LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_M

 AC_CHECK_LIB(iconv, libiconv_open, LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv")

-AC_CHECK_FUNCS(poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat inet_ntop setgroups initgroups ctime_r mkstemp)

+AC_CHECK_FUNCS(poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp)

 AC_FUNC_MMAP

 AC_FUNC_FSEEKO

@@ -397,6 +397,24 @@ char *cli_strrcpy(char *dest, const char *source) /* by NJH */

     return --dest;

 }

+#ifndef HAVE_STRCASESTR

+const char* cli_strcasestr(const char* a, const char *b)

+{

+	/*

+	 * From http://unixpapa.com/incnote/string.html, which has this notice:

+	 * All of the C code on this page is public domain and may be used without concern for licenses. Some was contributed by Dan Cross.

+	 */

+	size_t l;

+	char f[3];

+

+	snprintf(f, sizeof(f), "%c%c", tolower(*b), toupper(*b));

+	for (l = strcspn(a, f); l != strlen(a); l += strcspn(a + l + 1, f) + 1)

+		if (strncasecmp(a + l, b, strlen(b)) == 0)

+			return(a + l);

+	return(NULL);

+}

+#endif

+

 void cli_strtokenize(char *buffer, const char delim, const size_t token_count, const char **tokens)

 {

 	size_t tokens_found;

@@ -23,6 +23,12 @@

 #include "cltypes.h"

+#ifdef HAVE_STRCASESTR

+#define cli_strcasestr strcasestr

+#else

+const char *cli_strcasestr(const char *haystack, const char *needle);

+#endif

+

 int cli_strbcasestr(const char *haystack, const char *needle);

 int cli_chomp(char *string);

 char *cli_strtok(const char *line, int field, const char *delim);