/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to plugins.d/splashy.c

* plugin-runner.c (getplugin, add_environment, main): Handle EINTR
                                                      properly.

* plugins.d/mandos-client.c (start_mandos_communication): Bug fix:
  move out "decrypted_buffer_size" to where it is needed.

* plugins.d/splashy.c (termination_handler): Save signal received.
  (main): Check return value from "sigaddset()".

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/splashy.c
30
30
                                   SIG_IGN, kill(), SIGKILL */
31
31
#include <stddef.h>             /* NULL */
32
32
#include <stdlib.h>             /* getenv() */
33
 
#include <stdio.h>              /* asprintf(), perror(), sscanf() */
 
33
#include <stdio.h>              /* asprintf(), perror() */
34
34
#include <stdlib.h>             /* EXIT_FAILURE, free(),
35
35
                                   EXIT_SUCCESS */
36
36
#include <sys/types.h>          /* pid_t, DIR, struct dirent,
37
37
                                   ssize_t */
38
38
#include <dirent.h>             /* opendir(), readdir(), closedir() */
39
 
#include <inttypes.h>           /* intmax_t, SCNdMAX */
 
39
#include <inttypes.h>           /* intmax_t, strtoimax() */
40
40
#include <sys/stat.h>           /* struct stat, lstat(), S_ISLNK */
41
41
#include <iso646.h>             /* not, or, and */
42
42
#include <unistd.h>             /* readlink(), fork(), execl(),
48
48
                                   WEXITSTATUS() */
49
49
 
50
50
sig_atomic_t interrupted_by_signal = 0;
 
51
int signal_received;
51
52
 
52
 
static void termination_handler(__attribute__((unused))int signum){
 
53
static void termination_handler(int signum){
 
54
  if(interrupted_by_signal){
 
55
    return;
 
56
  }
53
57
  interrupted_by_signal = 1;
 
58
  signal_received = signum;
54
59
}
55
60
 
56
61
int main(__attribute__((unused))int argc,
101
106
      pid_t pid;
102
107
      {
103
108
        intmax_t tmpmax;
104
 
        int numchars;
105
 
        ret = sscanf(proc_ent->d_name, "%" SCNdMAX "%n", &tmpmax,
106
 
                     &numchars);
107
 
        if(ret < 1 or tmpmax != (pid_t)tmpmax
108
 
           or proc_ent->d_name[numchars] != '\0'){
 
109
        char *tmp;
 
110
        errno = 0;
 
111
        tmpmax = strtoimax(proc_ent->d_name, &tmp, 10);
 
112
        if(errno != 0 or tmp == proc_ent->d_name or *tmp != '\0'
 
113
           or tmpmax != (pid_t)tmpmax){
109
114
          /* Not a process */
110
115
          continue;
111
116
        }
170
175
                     .sa_flags = 0 };
171
176
    sigemptyset(&new_action.sa_mask);
172
177
    sigaddset(&new_action.sa_mask, SIGINT);
 
178
    if(ret == -1){
 
179
      perror("sigaddset");
 
180
      free(prompt);
 
181
      return EXIT_FAILURE;
 
182
    }
173
183
    sigaddset(&new_action.sa_mask, SIGHUP);
 
184
    if(ret == -1){
 
185
      perror("sigaddset");
 
186
      free(prompt);
 
187
      return EXIT_FAILURE;
 
188
    }
174
189
    sigaddset(&new_action.sa_mask, SIGTERM);
 
190
    if(ret == -1){
 
191
      perror("sigaddset");
 
192
      free(prompt);
 
193
      return EXIT_FAILURE;
 
194
    }
175
195
    ret = sigaction(SIGINT, NULL, &old_action);
176
196
    if(ret == -1){
177
197
      perror("sigaction");