/mandos/trunk

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

« back to all changes in this revision

Viewing changes to plugins.d/splashy.c

  • Committer: Teddy Hogeborn
  • Date: 2009-09-16 23:28:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090916232839-3o7i8qmcdcz5j1ya
* init.d-mandos (Required-Start, Required-Stop): Bug fix: Added
                 "$syslog", thanks to Petter Reinholdtsen
                 <pere@hungry.com> (Debian bug #546928).

* initramfs-tools-script: Removed erroneous comment.

* plugins.d/askpass-fifo.c: Removed TEMP_FAILURE_RETRY since it is
                            not needed.

* plugins.d/mandos-client.c (main): Bug fix: Initialize
                                    "old_sigterm_action".

* plugins.d/splashy.c (main): Bug fix: really check return value from
                              "sigaddset".  Fix some warnings on
                              64-bit systems.

* plugins.d/usplash.c (termination_handler, main): Save received
                                                   signal and
                                                   re-raise it on
                                                   exit.
  (usplash_write): Do not close FIFO, instead, take an additional file
                   descriptor pointer to it and open only when needed
                   (all callers changed).  Abort immediately on EINTR.
                   Bug fix:  Add NUL byte on single-word commands.
                   Ignore "interrupted_by_signal".
  (makeprompt, find_usplash): New; broken out from "main()".
  (find_usplash): Bug fix: close /proc/<pid>/cmdline FD on error.
  (main): Reorganized to jump to a new "failure" label on any error.
          Bug fix: check return values from sigaddset.
          New variable "usplash_accessed" to flag if usplash(8) needs
          to be killed and restarted.  Removed the "an_error_occured"
          variable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/splashy.c
172
172
      new_action = { .sa_handler = termination_handler,
173
173
                     .sa_flags = 0 };
174
174
    sigemptyset(&new_action.sa_mask);
175
 
    sigaddset(&new_action.sa_mask, SIGINT);
176
 
    if(ret == -1){
177
 
      perror("sigaddset");
178
 
      goto failure;
179
 
    }
180
 
    sigaddset(&new_action.sa_mask, SIGHUP);
181
 
    if(ret == -1){
182
 
      perror("sigaddset");
183
 
      goto failure;
184
 
    }
185
 
    sigaddset(&new_action.sa_mask, SIGTERM);
 
175
    ret = sigaddset(&new_action.sa_mask, SIGINT);
 
176
    if(ret == -1){
 
177
      perror("sigaddset");
 
178
      goto failure;
 
179
    }
 
180
    ret = sigaddset(&new_action.sa_mask, SIGHUP);
 
181
    if(ret == -1){
 
182
      perror("sigaddset");
 
183
      goto failure;
 
184
    }
 
185
    ret = sigaddset(&new_action.sa_mask, SIGTERM);
186
186
    if(ret == -1){
187
187
      perror("sigaddset");
188
188
      goto failure;
298
298
      TEMP_FAILURE_RETRY(kill(splashy_pid, SIGKILL));
299
299
      sleep(1);
300
300
    }
301
 
    pid_t new_splashy_pid = TEMP_FAILURE_RETRY(fork());
 
301
    pid_t new_splashy_pid = (pid_t)TEMP_FAILURE_RETRY(fork());
302
302
    if(new_splashy_pid == 0){
303
303
      /* Child; will become new splashy process */
304
304
      
333
333
    struct sigaction signal_action;
334
334
    sigemptyset(&signal_action.sa_mask);
335
335
    signal_action.sa_handler = SIG_DFL;
336
 
    ret = TEMP_FAILURE_RETRY(sigaction(signal_received,
337
 
                                       &signal_action, NULL));
 
336
    ret = (int)TEMP_FAILURE_RETRY(sigaction(signal_received,
 
337
                                            &signal_action, NULL));
338
338
    if(ret == -1){
339
339
      perror("sigaction");
340
340
    }