@@ -1,3 +1,10 @@

+Sat Jun 12 19:21:44 CEST 2004 (tk)

+----------------------------------

+  * shared/cfgparser: freecfg: fix loop when some directives are doubled in

+		      config file (bug found by Ole Craig <olc*cs.umass.edu>)

+  * libclamav: scanners: add 'X-Real-To: ' mail type (thanks to Andrey

+			 J. Melnikoff (TEMHOTA) <temnota*kmv.ru>)

+

 Sat Jun 12 17:32:31 CEST 2004 (tk)

 ----------------------------------

   * libclamav: fix problem with {set,init}groups on Windows SFU 3.5 (reported

@@ -46,7 +46,7 @@ while test $# -gt 0; do

 	;;

     --version)

-	echo devel-20040611

+	echo devel-20040612

 	exit 0

 	;;

@@ -446,7 +446,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 	    }

 	    if(upxfn(src, ssize, dest, dsize)) {

-		cli_dbg("UPX decompression failed\n");

+		cli_dbgmsg("UPX decompression failed\n");

 	    } else {

 		    int ndesc;

@@ -101,6 +101,7 @@ static const struct cli_magic_s cli_magic[] = {

     {0,  "X-Original-To: ",		15, "Mail",		  CL_MAILFILE},

     {0,  "X-Symantec-",			11, "Symantec",		  CL_MAILFILE},

     {0,  "X-EVS",			 5, "EVS mail",		  CL_MAILFILE},

+    {0,  "X-Real-To: ",                 11, "Mail",               CL_MAILFILE},

     {0,  ">From ",			 6, "Mail",		  CL_MAILFILE},

     {0,  "Date: ",			 6, "Mail",		  CL_MAILFILE},

     {0,  "Message-Id: ",		12, "Mail",		  CL_MAILFILE},

@@ -238,14 +238,15 @@ void freecfg(struct cfgstruct *copt)

     while (copt) {

 	arg = copt->nextarg;

-	while (arg) {

+	while(arg) {

 	    if(arg->strarg) {

 		free(arg->optname);

 		free(arg->strarg);

 		handler = arg;

-		arg=arg->nextarg;

+		arg = arg->nextarg;

 		free(handler);

-	    }

+	    } else

+		arg = arg->nextarg;

 	}

 	if(copt->optname) {

 	    free(copt->optname);