Re: syslogd sigmask

2014-10-05 Thread Alexander Bluhm
Hi,

As libevent provides safe signal callbacks instead of signal handlers,
the sigprocmask(2) protection is not necessary and can be removed.

ok?

bluhm

Index: usr.sbin/syslogd/syslogd.c
===
RCS file: /cvs/src/usr.sbin/syslogd/syslogd.c,v
retrieving revision 1.128
diff -u -p -r1.128 syslogd.c
--- usr.sbin/syslogd/syslogd.c  5 Oct 2014 18:14:01 -   1.128
+++ usr.sbin/syslogd/syslogd.c  5 Oct 2014 19:46:48 -
@@ -759,18 +759,12 @@ logmsg(int pri, char *msg, char *from, i
 {
struct filed *f;
int fac, msglen, prilev, i;
-   sigset_t mask, omask;
char *timestamp;
char prog[NAME_MAX+1];
 
dprintf(logmsg: pri 0%o, flags 0x%x, from %s, msg %s\n,
pri, flags, from, msg);
 
-   sigemptyset(mask);
-   sigaddset(mask, SIGALRM);
-   sigaddset(mask, SIGHUP);
-   sigprocmask(SIG_BLOCK, mask, omask);
-
/*
 * Check to see if msg looks non-standard.
 */
@@ -818,7 +812,6 @@ logmsg(int pri, char *msg, char *from, i
(void)close(f-f_file);
f-f_file = -1;
}
-   (void)sigprocmask(SIG_SETMASK, omask, NULL);
return;
}
for (f = Files; f; f = f-f_next) {
@@ -883,7 +876,6 @@ logmsg(int pri, char *msg, char *from, i
if (f-f_quick)
break;
}
-   (void)sigprocmask(SIG_SETMASK, omask, NULL);
 }
 
 void



Re: syslogd sigmask

2014-10-05 Thread Nicholas Marriott

ok nicm



On Sun, Oct 05, 2014 at 09:47:56PM +0200, Alexander Bluhm wrote:
 Hi,
 
 As libevent provides safe signal callbacks instead of signal handlers,
 the sigprocmask(2) protection is not necessary and can be removed.
 
 ok?
 
 bluhm
 
 Index: usr.sbin/syslogd/syslogd.c
 ===
 RCS file: /cvs/src/usr.sbin/syslogd/syslogd.c,v
 retrieving revision 1.128
 diff -u -p -r1.128 syslogd.c
 --- usr.sbin/syslogd/syslogd.c5 Oct 2014 18:14:01 -   1.128
 +++ usr.sbin/syslogd/syslogd.c5 Oct 2014 19:46:48 -
 @@ -759,18 +759,12 @@ logmsg(int pri, char *msg, char *from, i
  {
   struct filed *f;
   int fac, msglen, prilev, i;
 - sigset_t mask, omask;
   char *timestamp;
   char prog[NAME_MAX+1];
  
   dprintf(logmsg: pri 0%o, flags 0x%x, from %s, msg %s\n,
   pri, flags, from, msg);
  
 - sigemptyset(mask);
 - sigaddset(mask, SIGALRM);
 - sigaddset(mask, SIGHUP);
 - sigprocmask(SIG_BLOCK, mask, omask);
 -
   /*
* Check to see if msg looks non-standard.
*/
 @@ -818,7 +812,6 @@ logmsg(int pri, char *msg, char *from, i
   (void)close(f-f_file);
   f-f_file = -1;
   }
 - (void)sigprocmask(SIG_SETMASK, omask, NULL);
   return;
   }
   for (f = Files; f; f = f-f_next) {
 @@ -883,7 +876,6 @@ logmsg(int pri, char *msg, char *from, i
   if (f-f_quick)
   break;
   }
 - (void)sigprocmask(SIG_SETMASK, omask, NULL);
  }
  
  void