@@ -1,3 +1,8 @@

+Fri Mar  2 01:44:10 CET 2007 (tk)

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

+  * shared/output.c: revert patch for bb#360 (didn't work properly when

+		     mprintf() was called from logg())

+

 Thu Mar  1 22:12:22 CET 2007 (tk)

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

   * clamd/server-th.c: make more attempts when cl_load returns CL_ELOCKDB

@@ -287,20 +287,20 @@ void mprintf(const char *str, ...)

     vsnprintf(buff, sizeof(buff), str, args);

     va_end(args);

-    if(*str == '!') {

+    if(buff[0] == '!') {

        if(!mprintf_stdout)

            fd = stderr;

 	fprintf(fd, "ERROR: %s", &buff[1]);

-    } else if(*str == '@') {

+    } else if(buff[0] == '@') {

        if(!mprintf_stdout)

            fd = stderr;

 	fprintf(fd, "ERROR: %s", &buff[1]);

     } else if(!mprintf_quiet) {

-	if(*str == '^') {

+	if(buff[0] == '^') {

            if(!mprintf_stdout)

                fd = stderr;

 	    fprintf(fd, "WARNING: %s", &buff[1]);

-	} else if(*str == '*') {

+	} else if(buff[0] == '*') {

 	    if(mprintf_verbose)

 		fprintf(fd, "%s", &buff[1]);

 	} else fprintf(fd, "%s", buff);