/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/askpass-fifo.c

  • Committer: Teddy Hogeborn
  • Date: 2009-09-06 05:37:34 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090906053734-uf180lq30ivv4nfy
* 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/askpass-fifo.c
1
1
/*  -*- coding: utf-8 -*- */
2
2
/*
3
 
 * Passprompt - Read a password from a FIFO and output it
 
3
 * Askpass-FIFO - Read a password from a FIFO and output it
4
4
 * 
5
5
 * Copyright © 2008,2009 Teddy Hogeborn
6
6
 * Copyright © 2008,2009 Björn Påhlsson
29
29
#include <iso646.h>             /* and */
30
30
#include <errno.h>              /* errno, EEXIST */
31
31
#include <stdio.h>              /* perror() */
32
 
#include <stdlib.h>             /* EXIT_FAILURE, NULL, size_t, free(), 
 
32
#include <stdlib.h>             /* EXIT_FAILURE, NULL, size_t, free(),
33
33
                                   realloc(), EXIT_SUCCESS */
34
34
#include <fcntl.h>              /* open(), O_RDONLY */
35
35
#include <unistd.h>             /* read(), close(), write(),
43
43
  
44
44
  /* Create FIFO */
45
45
  const char passfifo[] = "/lib/cryptsetup/passfifo";
46
 
  ret = TEMP_FAILURE_RETRY(mkfifo(passfifo, S_IRUSR | S_IWUSR));
 
46
  ret = (int)TEMP_FAILURE_RETRY(mkfifo(passfifo, S_IRUSR | S_IWUSR));
47
47
  if(ret == -1 and errno != EEXIST){
48
48
    perror("mkfifo");
49
49
    return EXIT_FAILURE;
50
50
  }
51
51
  
52
52
  /* Open FIFO */
53
 
  int fifo_fd = TEMP_FAILURE_RETRY(open(passfifo, O_RDONLY));
 
53
  int fifo_fd = (int)TEMP_FAILURE_RETRY(open(passfifo, O_RDONLY));
54
54
  if(fifo_fd == -1){
55
55
    perror("open");
56
56
    return EXIT_FAILURE;