/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
1
/*  -*- coding: utf-8; mode: c; mode: orgtbl -*- */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
2
/*
237.2.24 by Teddy Hogeborn
* plugins.d/askpass-fifo.c: Fix name in header.
3
 * Password-prompt - Read a password from the terminal and print it
237.1.2 by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax
4
 * 
237.2.9 by Teddy Hogeborn
* README: Update copyright year; add "2009".
5
 * Copyright © 2008,2009 Teddy Hogeborn
6
 * Copyright © 2008,2009 Björn Påhlsson
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
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
 * 
237.2.126 by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes.
22
 * Contact the authors at <mandos@fukt.bsnet.se>.
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
23
 */
24
13 by Björn Påhlsson
Added following support:
25
#define _GNU_SOURCE		/* getline() */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
26
13 by Björn Påhlsson
Added following support:
27
#include <termios.h> 		/* struct termios, tcsetattr(),
28
				   TCSAFLUSH, tcgetattr(), ECHO */
29
#include <unistd.h>		/* struct termios, tcsetattr(),
30
				   STDIN_FILENO, TCSAFLUSH,
31
				   tcgetattr(), ECHO */
32
#include <signal.h>		/* sig_atomic_t, raise(), struct
33
				   sigaction, sigemptyset(),
34
				   sigaction(), sigaddset(), SIGINT,
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
35
				   SIGQUIT, SIGHUP, SIGTERM,
36
				   raise() */
24.1.26 by Björn Påhlsson
tally count of used symbols
37
#include <stddef.h>		/* NULL, size_t, ssize_t */
13 by Björn Påhlsson
Added following support:
38
#include <sys/types.h>		/* ssize_t */
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
39
#include <stdlib.h>		/* EXIT_SUCCESS, EXIT_FAILURE,
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
40
				   getenv() */
13 by Björn Påhlsson
Added following support:
41
#include <stdio.h>		/* fprintf(), stderr, getline(),
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
42
				   stdin, feof(), perror(), fputc()
43
				*/
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
44
#include <errno.h>		/* errno, EBADF, ENOTTY, EINVAL,
45
				   EFAULT, EFBIG, EIO, ENOSPC, EINTR
46
				*/
13 by Björn Påhlsson
Added following support:
47
#include <iso646.h>		/* or, not */
48
#include <stdbool.h>		/* bool, false, true */
24.1.141 by Björn Påhlsson
fixed incorrect include comments
49
#include <string.h> 		/* strlen, rindex */
24.1.26 by Björn Påhlsson
tally count of used symbols
50
#include <argp.h>		/* struct argp_option, struct
51
				   argp_state, struct argp,
52
				   argp_parse(), error_t,
53
				   ARGP_KEY_ARG, ARGP_KEY_END,
54
				   ARGP_ERR_UNKNOWN */
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
55
#include <sysexits.h>		/* EX_SOFTWARE, EX_OSERR,
56
				   EX_UNAVAILABLE, EX_IOERR, EX_OK */
13 by Björn Påhlsson
Added following support:
57
237.2.57 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
58
volatile sig_atomic_t quit_now = 0;
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
59
int signal_received;
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
60
bool debug = false;
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
61
const char *argp_program_version = "password-prompt " VERSION;
24.1.17 by Björn Påhlsson
passprompt
62
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
13 by Björn Påhlsson
Added following support:
63
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
64
static void termination_handler(int signum){
65
  if(quit_now){
66
    return;
67
  }
237.2.57 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
68
  quit_now = 1;
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
69
  signal_received = signum;
13 by Björn Påhlsson
Added following support:
70
}
71
72
int main(int argc, char **argv){
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
73
  ssize_t ret;
13 by Björn Påhlsson
Added following support:
74
  size_t n;
75
  struct termios t_new, t_old;
76
  char *buffer = NULL;
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
77
  char *prefix = NULL;
13 by Björn Påhlsson
Added following support:
78
  int status = EXIT_SUCCESS;
79
  struct sigaction old_action,
80
    new_action = { .sa_handler = termination_handler,
81
		   .sa_flags = 0 };
24.1.17 by Björn Påhlsson
passprompt
82
  {
83
    struct argp_option options[] = {
84
      { .name = "prefix", .key = 'p',
85
	.arg = "PREFIX", .flags = 0,
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
86
	.doc = "Prefix shown before the prompt", .group = 2 },
24.1.17 by Björn Påhlsson
passprompt
87
      { .name = "debug", .key = 128,
88
	.doc = "Debug mode", .group = 3 },
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
89
      /*
90
       * These reproduce what we would get without ARGP_NO_HELP
91
       */
92
      { .name = "help", .key = '?',
93
	.doc = "Give this help list", .group = -1 },
94
      { .name = "usage", .key = -3,
95
	.doc = "Give a short usage message", .group = -1 },
96
      { .name = "version", .key = 'V',
97
	.doc = "Print program version", .group = -1 },
24.1.17 by Björn Påhlsson
passprompt
98
      { .name = NULL }
99
    };
237.2.20 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
100
    
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
101
    error_t parse_opt (int key, char *arg, struct argp_state *state){
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
102
      errno = 0;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
103
      switch (key){
24.1.17 by Björn Påhlsson
passprompt
104
      case 'p':
105
	prefix = arg;
106
	break;
107
      case 128:
108
	debug = true;
109
	break;
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
110
	/*
111
	 * These reproduce what we would get without ARGP_NO_HELP
112
	 */
113
      case '?':			/* --help */
114
	argp_state_help(state, state->out_stream,
115
			(ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR)
116
			& ~(unsigned int)ARGP_HELP_EXIT_OK);
117
      case -3:			/* --usage */
118
	argp_state_help(state, state->out_stream,
119
			ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR);
120
      case 'V':			/* --version */
121
	fprintf(state->out_stream, "%s\n", argp_program_version);
122
	exit(argp_err_exit_status);
24.1.17 by Björn Påhlsson
passprompt
123
	break;
124
      default:
125
	return ARGP_ERR_UNKNOWN;
126
      }
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
127
      return errno;
24.1.17 by Björn Påhlsson
passprompt
128
    }
237.2.20 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
129
    
24.1.17 by Björn Påhlsson
passprompt
130
    struct argp argp = { .options = options, .parser = parse_opt,
131
			 .args_doc = "",
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
132
			 .doc = "Mandos password-prompt -- Read and"
133
			 " output a password" };
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
134
    ret = argp_parse(&argp, argc, argv,
135
		     ARGP_IN_ORDER | ARGP_NO_HELP, NULL, NULL);
136
    switch(ret){
137
    case 0:
138
      break;
139
    case ENOMEM:
140
    default:
141
      errno = ret;
142
      perror("argp_parse");
143
      return EX_OSERR;
144
    case EINVAL:
145
      return EX_USAGE;
24.1.26 by Björn Påhlsson
tally count of used symbols
146
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
147
  }
237.2.20 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
148
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
149
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
150
    fprintf(stderr, "Starting %s\n", argv[0]);
151
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
152
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
153
    fprintf(stderr, "Storing current terminal attributes\n");
154
  }
13 by Björn Påhlsson
Added following support:
155
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
156
  if(tcgetattr(STDIN_FILENO, &t_old) != 0){
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
157
    int e = errno;
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
158
    perror("tcgetattr");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
159
    switch(e){
160
    case EBADF:
161
    case ENOTTY:
162
      return EX_UNAVAILABLE;
163
    default:
164
      return EX_OSERR;
165
    }
13 by Björn Påhlsson
Added following support:
166
  }
167
  
168
  sigemptyset(&new_action.sa_mask);
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
169
  ret = sigaddset(&new_action.sa_mask, SIGINT);
170
  if(ret == -1){
171
    perror("sigaddset");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
172
    return EX_OSERR;
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
173
  }
174
  ret = sigaddset(&new_action.sa_mask, SIGHUP);
175
  if(ret == -1){
176
    perror("sigaddset");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
177
    return EX_OSERR;
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
178
  }
179
  ret = sigaddset(&new_action.sa_mask, SIGTERM);
180
  if(ret == -1){
181
    perror("sigaddset");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
182
    return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
183
  }
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
184
  /* Need to check if the handler is SIG_IGN before handling:
185
     | [[info:libc:Initial Signal Actions]] |
186
     | [[info:libc:Basic Signal Handling]]  |
187
  */
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
188
  ret = sigaction(SIGINT, NULL, &old_action);
189
  if(ret == -1){
190
    perror("sigaction");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
191
    return EX_OSERR;
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
192
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
193
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
194
    ret = sigaction(SIGINT, &new_action, NULL);
195
    if(ret == -1){
196
      perror("sigaction");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
197
      return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
198
    }
199
  }
200
  ret = sigaction(SIGHUP, NULL, &old_action);
201
  if(ret == -1){
202
    perror("sigaction");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
203
    return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
204
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
205
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
206
    ret = sigaction(SIGHUP, &new_action, NULL);
207
    if(ret == -1){
208
      perror("sigaction");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
209
      return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
210
    }
211
  }
212
  ret = sigaction(SIGTERM, NULL, &old_action);
213
  if(ret == -1){
214
    perror("sigaction");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
215
    return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
216
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
217
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
218
    ret = sigaction(SIGTERM, &new_action, NULL);
219
    if(ret == -1){
220
      perror("sigaction");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
221
      return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
222
    }
223
  }
224
  
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
225
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
226
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
227
    fprintf(stderr, "Removing echo flag from terminal attributes\n");
228
  }
13 by Björn Påhlsson
Added following support:
229
  
230
  t_new = t_old;
237.2.140 by Teddy Hogeborn
* plugins.d/password-prompt.c (main): Fix "-Wconversion" warning.
231
  t_new.c_lflag &= ~(tcflag_t)ECHO;
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
232
  if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_new) != 0){
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
233
    int e = errno;
13 by Björn Påhlsson
Added following support:
234
    perror("tcsetattr-echo");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
235
    switch(e){
236
    case EBADF:
237
    case ENOTTY:
238
      return EX_UNAVAILABLE;
239
    case EINVAL:
240
    default:
241
      return EX_OSERR;
242
    }
13 by Björn Påhlsson
Added following support:
243
  }
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
244
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
245
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
246
    fprintf(stderr, "Waiting for input from stdin \n");
247
  }
13 by Björn Påhlsson
Added following support:
248
  while(true){
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
249
    if(quit_now){
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
250
      if(debug){
251
	fprintf(stderr, "Interrupted by signal, exiting.\n");
252
      }
13 by Björn Påhlsson
Added following support:
253
      status = EXIT_FAILURE;
254
      break;
255
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
256
257
    if(prefix){
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
258
      fprintf(stderr, "%s ", prefix);
259
    }
260
    {
237.2.160 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
261
      const char *cryptsource = getenv("CRYPTTAB_SOURCE");
262
      const char *crypttarget = getenv("CRYPTTAB_NAME");
263
      /* Before cryptsetup 1.1.0~rc2 */
264
      if(cryptsource == NULL){
265
	cryptsource = getenv("cryptsource");
266
      }
267
      if(crypttarget == NULL){
268
	crypttarget = getenv("crypttarget");
269
      }
270
      const char *const prompt1 = "Unlocking the disk";
271
      const char *const prompt2 = "Enter passphrase";
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
272
      if(cryptsource == NULL){
273
	if(crypttarget == NULL){
237.2.160 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
274
	  fprintf(stderr, "%s to unlock the disk: ", prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
275
	} else {
237.2.160 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
276
	  fprintf(stderr, "%s (%s)\n%s: ", prompt1, crypttarget,
277
		  prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
278
	}
279
      } else {
280
	if(crypttarget == NULL){
237.2.160 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
281
	  fprintf(stderr, "%s %s\n%s: ", prompt1, cryptsource,
282
		  prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
283
	} else {
237.2.160 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
284
	  fprintf(stderr, "%s %s (%s)\n%s: ", prompt1, cryptsource,
285
		  crypttarget, prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
286
	}
287
      }
288
    }
13 by Björn Påhlsson
Added following support:
289
    ret = getline(&buffer, &n, stdin);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
290
    if(ret > 0){
13 by Björn Påhlsson
Added following support:
291
      status = EXIT_SUCCESS;
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
292
      /* Make n = data size instead of allocated buffer size */
293
      n = (size_t)ret;
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
294
      /* Strip final newline */
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
295
      if(n > 0 and buffer[n-1] == '\n'){
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
296
	buffer[n-1] = '\0';	/* not strictly necessary */
297
	n--;
298
      }
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
299
      size_t written = 0;
300
      while(written < n){
301
	ret = write(STDOUT_FILENO, buffer + written, n - written);
302
	if(ret < 0){
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
303
	  int e = errno;
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
304
	  perror("write");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
305
	  switch(e){
306
	  case EBADF:
307
	  case EFAULT:
308
	  case EINVAL:
309
	  case EFBIG:
310
	  case EIO:
311
	  case ENOSPC:
312
	  default:
313
	    status = EX_IOERR;
314
	    break;
315
	  case EINTR:
316
	    status = EXIT_FAILURE;
317
	    break;
318
	  }
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
319
	  break;
320
	}
321
	written += (size_t)ret;
322
      }
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
323
      ret = close(STDOUT_FILENO);
324
      if(ret == -1){
325
	int e = errno;
326
	perror("close");
327
	switch(e){
328
	case EBADF:
329
	  status = EX_OSFILE;
330
	  break;
331
	case EIO:
332
	default:
333
	  status = EX_IOERR;
334
	  break;
335
	}
336
      }
13 by Björn Påhlsson
Added following support:
337
      break;
338
    }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
339
    if(ret < 0){
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
340
      int e = errno;
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
341
      if(errno != EINTR and not feof(stdin)){
13 by Björn Påhlsson
Added following support:
342
	perror("getline");
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
343
	switch(e){
344
	case EBADF:
345
	  status = EX_UNAVAILABLE;
346
	case EIO:
347
	case EINVAL:
348
	default:
349
	  status = EX_IOERR;
350
	  break;
351
	}
13 by Björn Påhlsson
Added following support:
352
	break;
353
      }
354
    }
41 by Teddy Hogeborn
Merge.
355
    /* if(ret == 0), then the only sensible thing to do is to retry to
356
       read from stdin */
13 by Björn Påhlsson
Added following support:
357
    fputc('\n', stderr);
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
358
    if(debug and not quit_now){
237.2.57 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
359
      /* If quit_now is nonzero, we were interrupted by a signal, and
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
360
	 will print that later, so no need to show this too. */
361
      fprintf(stderr, "getline() returned 0, retrying.\n");
362
    }
13 by Björn Påhlsson
Added following support:
363
  }
237.2.20 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
364
  
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
365
  free(buffer);
41 by Teddy Hogeborn
Merge.
366
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
367
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
368
    fprintf(stderr, "Restoring terminal attributes\n");
369
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
370
  if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_old) != 0){
13 by Björn Påhlsson
Added following support:
371
    perror("tcsetattr+echo");
372
  }
41 by Teddy Hogeborn
Merge.
373
  
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
374
  if(quit_now){
375
    sigemptyset(&old_action.sa_mask);
376
    old_action.sa_handler = SIG_DFL;
377
    ret = sigaction(signal_received, &old_action, NULL);
378
    if(ret == -1){
379
      perror("sigaction");
380
    }
381
    raise(signal_received);
382
  }
383
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
384
  if(debug){
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
385
    fprintf(stderr, "%s is exiting with status %d\n", argv[0],
386
	    status);
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
387
  }
237.2.154 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
388
  if(status == EXIT_SUCCESS or status == EX_OK){
167 by Teddy Hogeborn
* plugins.d/password-prompt.c (main): If successful, output an extra
389
    fputc('\n', stderr);
390
  }
13 by Björn Påhlsson
Added following support:
391
  
392
  return status;
393
}