← Back to branch summary

~ubuntu-branches/debian/sid/rsyslog/sid

« back to all changes in this revision

Viewing changes to plugins/omprog/omprog.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl, Michael Biebl, Daniel Pocock
  • Date: 2014-03-11 19:52:49 UTC
  • mfrom: (1.1.37)
  • Revision ID: package-import@ubuntu.com-20140311195249-phbsh9be8lebawti
Tags: 7.4.8-1
http://bugs.debian.org/740869
http://bugs.debian.org/721277
[ Michael Biebl ]
* New upstream release.
* Update Build-Depends:
  - Bump libestr-dev to (>= 0.1.9).
  - Tighten liblognorm-dev to (<< 1.0.0).
  - Replace libjson0-dev with libjson-c-dev, we no longer need the
    transitional package.
* Bump Standards-Version to 3.9.5. No further changes.

[ Daniel Pocock ]
* Make template parameter not mandatory in mongodb output plugin. Patch
  cherry-picked from upstream Git. (Closes: #740869, #721277)
* Ensure JSON templates are NUL terminated. Patch cherry-picked from
  upstream Git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/omprog/omprog.c
122
122
{
123
123
        int i;
124
124
        struct sigaction sigAct;
 
125
        sigset_t set;
125
126
        char *newargv[] = { NULL };
126
127
        char *newenviron[] = { NULL };
127
128
 
146
147
 
147
148
        /* reset signal handlers to default */
148
149
        memset(&sigAct, 0, sizeof(sigAct));
149
 
        sigfillset(&sigAct.sa_mask);
 
150
        sigemptyset(&sigAct.sa_mask);
150
151
        sigAct.sa_handler = SIG_DFL;
151
152
        for(i = 1 ; i < NSIG ; ++i)
152
153
                sigaction(i, &sigAct, NULL);
 
154
        sigemptyset(&set);
 
155
        sigprocmask(SIG_SETMASK, &set, NULL);
153
156
 
154
157
        alarm(0);
155
158