@@ -1,3 +1,9 @@

+Thu May  6 11:34:40 CEST 2004 (tk)

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

+  * shared/output: logg: work around a problem with superfluous control

+		   characters passed to (v)syslog (reported by

+		   Chris Conn <cconn*abacom.com>)

+

 Wed May  5 13:33:12 BST 2004 (trog)

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

   * libclamav/vba_extract.c: Do endian conversion in Word6 macro code.

@@ -97,12 +97,14 @@ int logg(const char *str, ...)

 {

 	va_list args;

 	struct flock fl;

-	char *pt, *timestr;

+	char *pt, *timestr, vbuff[1025];

 	time_t currtime;

 	struct stat sb;

 	mode_t old_umask;

+    va_start(args, str);

+

     if(logg_file) {

 #ifdef CL_THREAD_SAFE

 	pthread_mutex_lock(&logg_mutex);

@@ -158,20 +160,18 @@ int logg(const char *str, ...)

 	    }

 	}

-	va_start(args, str);

 	if(*str == '!') {

 	    fprintf(logg_fd, "ERROR: ");

-	    vfprintf(logg_fd, str+1, args);

+	    vfprintf(logg_fd, str + 1, args);

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

 	    fprintf(logg_fd, "WARNING: ");

-	    vfprintf(logg_fd, str+1, args);

+	    vfprintf(logg_fd, str + 1, args);

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

 	    if(logg_verbose)

-		vfprintf(logg_fd, str+1, args);

+		vfprintf(logg_fd, str + 1, args);

 	} else vfprintf(logg_fd, str, args);

-	va_end(args);

 	fflush(logg_fd);

@@ -183,32 +183,30 @@ int logg(const char *str, ...)

 #if defined(USE_SYSLOG) && !defined(C_AIX)

     if(logg_syslog) {

-      /* SYSLOG logging - no need for locking, mutexes, times & stuff ... :-) */

-

-#ifndef vsyslog

-#define vsyslog(a,b,c)	{ \

-	char my_tmp[4096]; \

-	vsnprintf(my_tmp,4095,b,c); \

-	my_tmp[4095]=0; \

-	syslog(a,my_tmp); }

-#endif

-

-	va_start(args, str);

-

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

-	    vsyslog(LOG_ERR, str+1, args);

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

-	    vsyslog(LOG_WARNING, str+1, args);

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

+	/* due to a problem with superfluous control characters (which

+	 * vsnprintf() handles correctly) in (v)syslog we have to remove

+	 * them in a final string

+	 */

+	vsnprintf(vbuff, 1024, str, args);

+	vbuff[1024] = 0;

+

+	while((pt = strchr(vbuff, '%')))

+	    *pt = '_';

+

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

+	    syslog(LOG_ERR, vbuff + 1);

+	} else if(vbuff[0] == '^') {

+	    syslog(LOG_WARNING, vbuff + 1);

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

 	    if(logg_verbose) {

-		vsyslog(LOG_DEBUG, str+1, args);

+		syslog(LOG_DEBUG, vbuff + 1);

 	    }

-	} else vsyslog(LOG_INFO, str, args);

+	} else syslog(LOG_INFO, vbuff);

-	va_end(args);

     }

 #endif

+    va_end(args);

     return 0;

 }