* syslog.cc (setlogmask): Don't mask the mask.

(vsyslog): Fix priority check.
This commit is contained in:
Corinna Vinschen 2005-11-10 10:34:49 +00:00
parent 03ea3f832e
commit 2d5067835e
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2005-11-09 Corinna Vinschen <corinna@vinschen.de>
* syslog.cc (setlogmask): Don't mask the mask.
(vsyslog): Fix priority check.
2005-11-09 Scott Finneran <scottf@pacom.com>
* include/cygwin/signal.h: Add missing sigrelse prototype.

View File

@ -79,7 +79,7 @@ setlogmask (int maskpri)
return _my_tls.locals.process_logmask;
int old_mask = _my_tls.locals.process_logmask;
_my_tls.locals.process_logmask = maskpri & LOG_PRIMASK;
_my_tls.locals.process_logmask = maskpri;
return old_mask;
}
@ -263,7 +263,7 @@ vsyslog (int priority, const char *message, va_list ap)
{
debug_printf ("%x %s", priority, message);
/* If the priority fails the current mask, reject */
if (((priority & LOG_PRIMASK) & _my_tls.locals.process_logmask) == 0)
if ((LOG_MASK (LOG_PRI (priority)) & _my_tls.locals.process_logmask) == 0)
{
debug_printf ("failing message %x due to priority mask %x",
priority, _my_tls.locals.process_logmask);