/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-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/askpass-fifo.c
 
1
/*  -*- coding: utf-8 -*- */
 
2
/*
 
3
 * Askpass-FIFO - Read a password from a FIFO and output it
 
4
 * 
 
5
 * Copyright © 2008,2009 Teddy Hogeborn
 
6
 * Copyright © 2008,2009 Björn Påhlsson
 
7
 * 
 
8
 * This program is free software: you can redistribute it and/or
 
9
 * modify it under the terms of the GNU General Public License as
 
10
 * published by the Free Software Foundation, either version 3 of the
 
11
 * License, or (at your option) any later version.
 
12
 * 
 
13
 * This program is distributed in the hope that it will be useful, but
 
14
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 
16
 * General Public License for more details.
 
17
 * 
 
18
 * You should have received a copy of the GNU General Public License
 
19
 * along with this program.  If not, see
 
20
 * <http://www.gnu.org/licenses/>.
 
21
 * 
 
22
 * Contact the authors at <mandos@fukt.bsnet.se>.
 
23
 */
 
24
 
1
25
#define _GNU_SOURCE             /* TEMP_FAILURE_RETRY() */
2
26
#include <sys/types.h>          /* ssize_t */
3
27
#include <sys/stat.h>           /* mkfifo(), S_IRUSR, S_IWUSR */
4
28
#include <iso646.h>             /* and */
5
29
#include <errno.h>              /* errno, EEXIST */
6
30
#include <stdio.h>              /* perror() */
7
 
#include <stdlib.h>             /* EXIT_FAILURE, NULL, size_t, free(), 
 
31
#include <stdlib.h>             /* EXIT_FAILURE, NULL, size_t, free(),
8
32
                                   realloc(), EXIT_SUCCESS */
9
33
#include <fcntl.h>              /* open(), O_RDONLY */
10
34
#include <unistd.h>             /* read(), close(), write(),
18
42
  
19
43
  /* Create FIFO */
20
44
  const char passfifo[] = "/lib/cryptsetup/passfifo";
21
 
  ret = TEMP_FAILURE_RETRY(mkfifo(passfifo, S_IRUSR | S_IWUSR));
 
45
  ret = mkfifo(passfifo, S_IRUSR | S_IWUSR);
22
46
  if(ret == -1 and errno != EEXIST){
23
47
    perror("mkfifo");
24
48
    return EXIT_FAILURE;
25
49
  }
26
50
  
27
51
  /* Open FIFO */
28
 
  int fifo_fd = TEMP_FAILURE_RETRY(open(passfifo, O_RDONLY));
 
52
  int fifo_fd = open(passfifo, O_RDONLY);
29
53
  if(fifo_fd == -1){
30
54
    perror("open");
31
55
    return EXIT_FAILURE;
37
61
  {
38
62
    size_t buf_allocated = 0;
39
63
    const size_t blocksize = 1024;
40
 
    do{
 
64
    do {
41
65
      if(buf_len + blocksize > buf_allocated){
42
66
        char *tmp = realloc(buf, buf_allocated + blocksize);
43
67
        if(tmp == NULL){
48
72
        buf = tmp;
49
73
        buf_allocated += blocksize;
50
74
      }
51
 
      sret = TEMP_FAILURE_RETRY(read(fifo_fd, buf + buf_len,
52
 
                                     buf_allocated - buf_len));
 
75
      sret = read(fifo_fd, buf + buf_len, buf_allocated - buf_len);
53
76
      if(sret == -1){
54
77
        perror("read");
55
78
        free(buf);
56
79
        return EXIT_FAILURE;
57
80
      }
58
81
      buf_len += (size_t)sret;
59
 
    }while(sret != 0);
 
82
    } while(sret != 0);
60
83
  }
61
84
  
62
85
  /* Close FIFO */
63
 
  TEMP_FAILURE_RETRY(close(fifo_fd));
 
86
  close(fifo_fd);
64
87
  
65
88
  /* Print password to stdout */
66
89
  size_t written = 0;
67
90
  while(written < buf_len){
68
 
    sret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buf + written,
69
 
                                    buf_len - written));
 
91
    sret = write(STDOUT_FILENO, buf + written, buf_len - written);
70
92
    if(sret == -1){
71
93
      perror("write");
72
94
      free(buf);