/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/password-prompt.c

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/password-prompt.c
33
33
                                   sigaction, sigemptyset(),
34
34
                                   sigaction(), sigaddset(), SIGINT,
35
35
                                   SIGQUIT, SIGHUP, SIGTERM */
36
 
#include <stddef.h>             /* NULL, size_t, ssize_t */
 
36
#include <stddef.h>             /* NULL, size_t */
37
37
#include <sys/types.h>          /* ssize_t */
38
38
#include <stdlib.h>             /* EXIT_SUCCESS, EXIT_FAILURE,
39
39
                                   getopt_long */
44
44
#include <iso646.h>             /* or, not */
45
45
#include <stdbool.h>            /* bool, false, true */
46
46
#include <string.h>             /* strlen, rindex, strncmp, strcmp */
47
 
#include <argp.h>               /* struct argp_option, struct
48
 
                                   argp_state, struct argp,
49
 
                                   argp_parse(), error_t,
50
 
                                   ARGP_KEY_ARG, ARGP_KEY_END,
51
 
                                   ARGP_ERR_UNKNOWN */
 
47
#include <argp.h>               /* struct argp_option,
 
48
                                   struct argp_state, struct argp,
 
49
                                   argp_parse() */
52
50
 
53
51
volatile bool quit_now = false;
54
52
bool debug = false;
55
 
const char *argp_program_version = "password-prompt 1.0";
 
53
const char *argp_program_version = "passprompt 0.9";
56
54
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
57
55
 
58
56
static void termination_handler(__attribute__((unused))int signum){
103
101
    struct argp argp = { .options = options, .parser = parse_opt,
104
102
                         .args_doc = "",
105
103
                         .doc = "Mandos Passprompt -- Provides a passprompt" };
106
 
    ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
107
 
    if (ret == ARGP_ERR_UNKNOWN){
108
 
      fprintf(stderr, "Unknown error while parsing arguments\n");
109
 
      return EXIT_FAILURE;
110
 
    }
 
104
    argp_parse (&argp, argc, argv, 0, 0, NULL);
111
105
  }
112
106
    
113
107
  if (debug){
125
119
  sigaddset(&new_action.sa_mask, SIGINT);
126
120
  sigaddset(&new_action.sa_mask, SIGHUP);
127
121
  sigaddset(&new_action.sa_mask, SIGTERM);
128
 
  ret = sigaction(SIGINT, NULL, &old_action);
129
 
  if(ret == -1){
130
 
    perror("sigaction");
131
 
    return EXIT_FAILURE;
132
 
  }
133
 
  if (old_action.sa_handler != SIG_IGN){
134
 
    ret = sigaction(SIGINT, &new_action, NULL);
135
 
    if(ret == -1){
136
 
      perror("sigaction");
137
 
      return EXIT_FAILURE;
138
 
    }
139
 
  }
140
 
  ret = sigaction(SIGHUP, NULL, &old_action);
141
 
  if(ret == -1){
142
 
    perror("sigaction");
143
 
    return EXIT_FAILURE;
144
 
  }
145
 
  if (old_action.sa_handler != SIG_IGN){
146
 
    ret = sigaction(SIGHUP, &new_action, NULL);
147
 
    if(ret == -1){
148
 
      perror("sigaction");
149
 
      return EXIT_FAILURE;
150
 
    }
151
 
  }
152
 
  ret = sigaction(SIGTERM, NULL, &old_action);
153
 
  if(ret == -1){
154
 
    perror("sigaction");
155
 
    return EXIT_FAILURE;
156
 
  }
157
 
  if (old_action.sa_handler != SIG_IGN){
158
 
    ret = sigaction(SIGTERM, &new_action, NULL);
159
 
    if(ret == -1){
160
 
      perror("sigaction");
161
 
      return EXIT_FAILURE;
162
 
    }
163
 
  }
164
 
  
 
122
  sigaction(SIGINT, NULL, &old_action);
 
123
  if (old_action.sa_handler != SIG_IGN)
 
124
    sigaction(SIGINT, &new_action, NULL);
 
125
  sigaction(SIGHUP, NULL, &old_action);
 
126
  if (old_action.sa_handler != SIG_IGN)
 
127
    sigaction(SIGHUP, &new_action, NULL);
 
128
  sigaction(SIGTERM, NULL, &old_action);
 
129
  if (old_action.sa_handler != SIG_IGN)
 
130
    sigaction(SIGTERM, &new_action, NULL);
 
131
 
165
132
  
166
133
  if (debug){
167
134
    fprintf(stderr, "Removing echo flag from terminal attributes\n");