/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/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2009-09-17 11:22:28 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090917112228-yizc8zr9brqr3cjd
* plugins.d/mandos-client.c (main): Try harder to raise signal on
                                    exit, and wait for it to arrive.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
44
44
#include <stdint.h>             /* uint16_t, uint32_t */
45
45
#include <stddef.h>             /* NULL, size_t, ssize_t */
46
46
#include <stdlib.h>             /* free(), EXIT_SUCCESS, EXIT_FAILURE,
47
 
                                   srand(), strtof() */
 
47
                                   srand(), strtof(), abort() */
48
48
#include <stdbool.h>            /* bool, false, true */
49
49
#include <string.h>             /* memset(), strcmp(), strlen(),
50
50
                                   strerror(), asprintf(), strcpy() */
72
72
                                */
73
73
#include <unistd.h>             /* close(), SEEK_SET, off_t, write(),
74
74
                                   getuid(), getgid(), seteuid(),
75
 
                                   setgid() */
 
75
                                   setgid(), pause() */
76
76
#include <arpa/inet.h>          /* inet_pton(), htons */
77
77
#include <iso646.h>             /* not, or, and */
78
78
#include <argp.h>               /* struct argp_option, error_t, struct
1596
1596
  if(quit_now){
1597
1597
    sigemptyset(&old_sigterm_action.sa_mask);
1598
1598
    old_sigterm_action.sa_handler = SIG_DFL;
1599
 
    ret = sigaction(signal_received, &old_sigterm_action, NULL);
 
1599
    ret = (int)TEMP_FAILURE_RETRY(sigaction(signal_received,
 
1600
                                            &old_sigterm_action,
 
1601
                                            NULL));
1600
1602
    if(ret == -1){
1601
1603
      perror("sigaction");
1602
1604
    }
1603
 
    raise(signal_received);
 
1605
    do {
 
1606
      ret = raise(signal_received);
 
1607
    } while(ret != 0 and errno == EINTR);
 
1608
    if(ret != 0){
 
1609
      perror("raise");
 
1610
      abort();
 
1611
    }
 
1612
    TEMP_FAILURE_RETRY(pause());
1604
1613
  }
1605
1614
  
1606
1615
  return exitcode;