/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/password-prompt.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/password-prompt.c
1
 
/*  -*- coding: utf-8 -*- */
 
1
/*  -*- coding: utf-8; mode: c; mode: orgtbl -*- */
2
2
/*
3
3
 * Password-prompt - Read a password from the terminal and print it
4
4
 * 
33
33
#include <signal.h>             /* sig_atomic_t, raise(), struct
34
34
                                   sigaction, sigemptyset(),
35
35
                                   sigaction(), sigaddset(), SIGINT,
36
 
                                   SIGQUIT, SIGHUP, SIGTERM */
 
36
                                   SIGQUIT, SIGHUP, SIGTERM,
 
37
                                   raise() */
37
38
#include <stddef.h>             /* NULL, size_t, ssize_t */
38
39
#include <sys/types.h>          /* ssize_t */
39
40
#include <stdlib.h>             /* EXIT_SUCCESS, EXIT_FAILURE,
52
53
                                   ARGP_ERR_UNKNOWN */
53
54
 
54
55
volatile sig_atomic_t quit_now = 0;
 
56
int signal_received;
55
57
bool debug = false;
56
58
const char *argp_program_version = "password-prompt " VERSION;
57
59
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
58
60
 
59
 
static void termination_handler(__attribute__((unused))int signum){
 
61
static void termination_handler(int signum){
 
62
  if(quit_now){
 
63
    return;
 
64
  }
60
65
  quit_now = 1;
 
66
  signal_received = signum;
61
67
}
62
68
 
63
69
int main(int argc, char **argv){
123
129
  }
124
130
  
125
131
  sigemptyset(&new_action.sa_mask);
126
 
  sigaddset(&new_action.sa_mask, SIGINT);
127
 
  sigaddset(&new_action.sa_mask, SIGHUP);
128
 
  sigaddset(&new_action.sa_mask, SIGTERM);
 
132
  ret = sigaddset(&new_action.sa_mask, SIGINT);
 
133
  if(ret == -1){
 
134
    perror("sigaddset");
 
135
    return EXIT_FAILURE;
 
136
  }
 
137
  ret = sigaddset(&new_action.sa_mask, SIGHUP);
 
138
  if(ret == -1){
 
139
    perror("sigaddset");
 
140
    return EXIT_FAILURE;
 
141
  }
 
142
  ret = sigaddset(&new_action.sa_mask, SIGTERM);
 
143
  if(ret == -1){
 
144
    perror("sigaddset");
 
145
    return EXIT_FAILURE;
 
146
  }
 
147
  /* Need to check if the handler is SIG_IGN before handling:
 
148
     | [[info:libc:Initial Signal Actions]] |
 
149
     | [[info:libc:Basic Signal Handling]]  |
 
150
  */
129
151
  ret = sigaction(SIGINT, NULL, &old_action);
130
152
  if(ret == -1){
131
153
    perror("sigaction");
194
216
      const char *cryptsource = getenv("cryptsource");
195
217
      const char *crypttarget = getenv("crypttarget");
196
218
      const char *const prompt
197
 
        = "Enter passphrase to unlock the disk";      
 
219
        = "Enter passphrase to unlock the disk";
198
220
      if(cryptsource == NULL){
199
221
        if(crypttarget == NULL){
200
222
          fprintf(stderr, "%s: ", prompt);
242
264
    /* if(ret == 0), then the only sensible thing to do is to retry to
243
265
       read from stdin */
244
266
    fputc('\n', stderr);
245
 
    if(debug and quit_now == 0){
 
267
    if(debug and not quit_now){
246
268
      /* If quit_now is nonzero, we were interrupted by a signal, and
247
269
         will print that later, so no need to show this too. */
248
270
      fprintf(stderr, "getline() returned 0, retrying.\n");
258
280
    perror("tcsetattr+echo");
259
281
  }
260
282
  
 
283
  if(quit_now){
 
284
    sigemptyset(&old_action.sa_mask);
 
285
    old_action.sa_handler = SIG_DFL;
 
286
    ret = sigaction(signal_received, &old_action, NULL);
 
287
    if(ret == -1){
 
288
      perror("sigaction");
 
289
    }
 
290
    raise(signal_received);
 
291
  }
 
292
  
261
293
  if(debug){
262
294
    fprintf(stderr, "%s is exiting with status %d\n", argv[0],
263
295
            status);