bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
356
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 |
/*
|
261
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 |
*
|
246
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 |
*
|
|
363
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, |
|
356
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, |
79
by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables |
40 |
getopt_long, getenv() */ |
13
by Björn Påhlsson
Added following support: |
41 |
#include <stdio.h> /* fprintf(), stderr, getline(), |
42 |
stdin, feof(), perror(), fputc(), |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
43 |
getopt_long */ |
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 */ |
|
15.1.2
by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt |
49 |
#include <string.h> /* strlen, rindex, strncmp, strcmp */ |
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 */ |
|
391
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 |
|
294
by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile |
58 |
volatile sig_atomic_t quit_now = 0; |
356
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 |
|
356
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 |
} |
|
294
by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile |
68 |
quit_now = 1; |
356
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 }, |
|
89 |
{ .name = NULL } |
|
90 |
}; |
|
257
by Teddy Hogeborn
Change the default value of the "checker" option command to make the |
91 |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
92 |
error_t parse_opt (int key, char *arg, struct argp_state *state){ |
93 |
switch (key){ |
|
24.1.17
by Björn Påhlsson
passprompt |
94 |
case 'p': |
95 |
prefix = arg; |
|
96 |
break; |
|
97 |
case 128: |
|
98 |
debug = true; |
|
99 |
break; |
|
100 |
case ARGP_KEY_ARG: |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
101 |
argp_usage(state); |
24.1.17
by Björn Påhlsson
passprompt |
102 |
break; |
103 |
case ARGP_KEY_END: |
|
104 |
break; |
|
105 |
default: |
|
106 |
return ARGP_ERR_UNKNOWN; |
|
107 |
} |
|
108 |
return 0; |
|
109 |
} |
|
257
by Teddy Hogeborn
Change the default value of the "checker" option command to make the |
110 |
|
24.1.17
by Björn Påhlsson
passprompt |
111 |
struct argp argp = { .options = options, .parser = parse_opt, |
112 |
.args_doc = "", |
|
110
by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with |
113 |
.doc = "Mandos password-prompt -- Read and" |
114 |
" output a password" }; |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
115 |
ret = argp_parse(&argp, argc, argv, 0, 0, NULL); |
116 |
if(ret == ARGP_ERR_UNKNOWN){ |
|
24.1.44
by Björn Påhlsson
Fixed unkown -> unknown |
117 |
fprintf(stderr, "Unknown error while parsing arguments\n"); |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
118 |
return EX_SOFTWARE; |
24.1.26
by Björn Påhlsson
tally count of used symbols |
119 |
} |
15.1.3
by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt |
120 |
} |
257
by Teddy Hogeborn
Change the default value of the "checker" option command to make the |
121 |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
122 |
if(debug){ |
15.1.2
by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt |
123 |
fprintf(stderr, "Starting %s\n", argv[0]); |
124 |
} |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
125 |
if(debug){ |
15.1.2
by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt |
126 |
fprintf(stderr, "Storing current terminal attributes\n"); |
127 |
} |
|
13
by Björn Påhlsson
Added following support: |
128 |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
129 |
if(tcgetattr(STDIN_FILENO, &t_old) != 0){ |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
130 |
int e = errno; |
110
by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with |
131 |
perror("tcgetattr"); |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
132 |
switch(e){ |
133 |
case EBADF: |
|
134 |
case ENOTTY: |
|
135 |
return EX_UNAVAILABLE; |
|
136 |
default: |
|
137 |
return EX_OSERR; |
|
138 |
} |
|
13
by Björn Påhlsson
Added following support: |
139 |
} |
140 |
|
|
141 |
sigemptyset(&new_action.sa_mask); |
|
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
142 |
ret = sigaddset(&new_action.sa_mask, SIGINT); |
143 |
if(ret == -1){ |
|
144 |
perror("sigaddset"); |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
145 |
return EX_OSERR; |
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
146 |
} |
147 |
ret = sigaddset(&new_action.sa_mask, SIGHUP); |
|
148 |
if(ret == -1){ |
|
149 |
perror("sigaddset"); |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
150 |
return EX_OSERR; |
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
151 |
} |
152 |
ret = sigaddset(&new_action.sa_mask, SIGTERM); |
|
153 |
if(ret == -1){ |
|
154 |
perror("sigaddset"); |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
155 |
return EX_OSERR; |
24.1.26
by Björn Påhlsson
tally count of used symbols |
156 |
} |
356
by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show |
157 |
/* Need to check if the handler is SIG_IGN before handling: |
158 |
| [[info:libc:Initial Signal Actions]] |
|
|
159 |
| [[info:libc:Basic Signal Handling]] |
|
|
160 |
*/
|
|
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
161 |
ret = sigaction(SIGINT, NULL, &old_action); |
162 |
if(ret == -1){ |
|
163 |
perror("sigaction"); |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
164 |
return EX_OSERR; |
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
165 |
} |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
166 |
if(old_action.sa_handler != SIG_IGN){ |
24.1.26
by Björn Påhlsson
tally count of used symbols |
167 |
ret = sigaction(SIGINT, &new_action, NULL); |
168 |
if(ret == -1){ |
|
169 |
perror("sigaction"); |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
170 |
return EX_OSERR; |
24.1.26
by Björn Påhlsson
tally count of used symbols |
171 |
} |
172 |
} |
|
173 |
ret = sigaction(SIGHUP, NULL, &old_action); |
|
174 |
if(ret == -1){ |
|
175 |
perror("sigaction"); |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
176 |
return EX_OSERR; |
24.1.26
by Björn Påhlsson
tally count of used symbols |
177 |
} |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
178 |
if(old_action.sa_handler != SIG_IGN){ |
24.1.26
by Björn Påhlsson
tally count of used symbols |
179 |
ret = sigaction(SIGHUP, &new_action, NULL); |
180 |
if(ret == -1){ |
|
181 |
perror("sigaction"); |
|
391
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 |
} |
184 |
} |
|
185 |
ret = sigaction(SIGTERM, NULL, &old_action); |
|
186 |
if(ret == -1){ |
|
187 |
perror("sigaction"); |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
188 |
return EX_OSERR; |
24.1.26
by Björn Påhlsson
tally count of used symbols |
189 |
} |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
190 |
if(old_action.sa_handler != SIG_IGN){ |
24.1.26
by Björn Påhlsson
tally count of used symbols |
191 |
ret = sigaction(SIGTERM, &new_action, NULL); |
192 |
if(ret == -1){ |
|
193 |
perror("sigaction"); |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
194 |
return EX_OSERR; |
24.1.26
by Björn Påhlsson
tally count of used symbols |
195 |
} |
196 |
} |
|
197 |
|
|
15.1.2
by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt |
198 |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
199 |
if(debug){ |
15.1.2
by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt |
200 |
fprintf(stderr, "Removing echo flag from terminal attributes\n"); |
201 |
} |
|
13
by Björn Påhlsson
Added following support: |
202 |
|
203 |
t_new = t_old; |
|
377
by Teddy Hogeborn
* plugins.d/password-prompt.c (main): Fix "-Wconversion" warning. |
204 |
t_new.c_lflag &= ~(tcflag_t)ECHO; |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
205 |
if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_new) != 0){ |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
206 |
int e = errno; |
13
by Björn Påhlsson
Added following support: |
207 |
perror("tcsetattr-echo"); |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
208 |
switch(e){ |
209 |
case EBADF: |
|
210 |
case ENOTTY: |
|
211 |
return EX_UNAVAILABLE; |
|
212 |
case EINVAL: |
|
213 |
default: |
|
214 |
return EX_OSERR; |
|
215 |
} |
|
13
by Björn Påhlsson
Added following support: |
216 |
} |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
217 |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
218 |
if(debug){ |
15.1.2
by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt |
219 |
fprintf(stderr, "Waiting for input from stdin \n"); |
220 |
} |
|
13
by Björn Påhlsson
Added following support: |
221 |
while(true){ |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
222 |
if(quit_now){ |
110
by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with |
223 |
if(debug){ |
224 |
fprintf(stderr, "Interrupted by signal, exiting.\n"); |
|
225 |
} |
|
13
by Björn Påhlsson
Added following support: |
226 |
status = EXIT_FAILURE; |
227 |
break; |
|
228 |
} |
|
15.1.3
by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt |
229 |
|
230 |
if(prefix){ |
|
79
by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables |
231 |
fprintf(stderr, "%s ", prefix); |
232 |
} |
|
233 |
{ |
|
234 |
const char *cryptsource = getenv("cryptsource"); |
|
235 |
const char *crypttarget = getenv("crypttarget"); |
|
236 |
const char *const prompt |
|
355
by Teddy Hogeborn
* mandos: White-space fixes only. |
237 |
= "Enter passphrase to unlock the disk"; |
79
by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables |
238 |
if(cryptsource == NULL){ |
239 |
if(crypttarget == NULL){ |
|
240 |
fprintf(stderr, "%s: ", prompt); |
|
241 |
} else { |
|
242 |
fprintf(stderr, "%s (%s): ", prompt, crypttarget); |
|
243 |
} |
|
244 |
} else { |
|
245 |
if(crypttarget == NULL){ |
|
246 |
fprintf(stderr, "%s %s: ", prompt, cryptsource); |
|
247 |
} else { |
|
248 |
fprintf(stderr, "%s %s (%s): ", prompt, cryptsource, |
|
249 |
crypttarget); |
|
250 |
} |
|
251 |
} |
|
252 |
} |
|
13
by Björn Påhlsson
Added following support: |
253 |
ret = getline(&buffer, &n, stdin); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
254 |
if(ret > 0){ |
13
by Björn Påhlsson
Added following support: |
255 |
status = EXIT_SUCCESS; |
110
by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with |
256 |
/* Make n = data size instead of allocated buffer size */ |
257 |
n = (size_t)ret; |
|
168
by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only |
258 |
/* Strip final newline */ |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
259 |
if(n > 0 and buffer[n-1] == '\n'){ |
168
by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only |
260 |
buffer[n-1] = '\0'; /* not strictly necessary */ |
261 |
n--; |
|
262 |
} |
|
110
by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with |
263 |
size_t written = 0; |
264 |
while(written < n){ |
|
265 |
ret = write(STDOUT_FILENO, buffer + written, n - written); |
|
266 |
if(ret < 0){ |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
267 |
int e = errno; |
110
by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with |
268 |
perror("write"); |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
269 |
switch(e){ |
270 |
case EBADF: |
|
271 |
case EFAULT: |
|
272 |
case EINVAL: |
|
273 |
case EFBIG: |
|
274 |
case EIO: |
|
275 |
case ENOSPC: |
|
276 |
default: |
|
277 |
status = EX_IOERR; |
|
278 |
break; |
|
279 |
case EINTR: |
|
280 |
status = EXIT_FAILURE; |
|
281 |
break; |
|
282 |
} |
|
110
by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with |
283 |
break; |
284 |
} |
|
285 |
written += (size_t)ret; |
|
286 |
} |
|
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
287 |
ret = close(STDOUT_FILENO); |
288 |
if(ret == -1){ |
|
289 |
int e = errno; |
|
290 |
perror("close"); |
|
291 |
switch(e){ |
|
292 |
case EBADF: |
|
293 |
status = EX_OSFILE; |
|
294 |
break; |
|
295 |
case EIO: |
|
296 |
default: |
|
297 |
status = EX_IOERR; |
|
298 |
break; |
|
299 |
} |
|
300 |
} |
|
13
by Björn Påhlsson
Added following support: |
301 |
break; |
302 |
} |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
303 |
if(ret < 0){ |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
304 |
int e = errno; |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
305 |
if(errno != EINTR and not feof(stdin)){ |
13
by Björn Påhlsson
Added following support: |
306 |
perror("getline"); |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
307 |
switch(e){ |
308 |
case EBADF: |
|
309 |
status = EX_UNAVAILABLE; |
|
310 |
case EIO: |
|
311 |
case EINVAL: |
|
312 |
default: |
|
313 |
status = EX_IOERR; |
|
314 |
break; |
|
315 |
} |
|
13
by Björn Påhlsson
Added following support: |
316 |
break; |
317 |
} |
|
318 |
} |
|
41
by Teddy Hogeborn
Merge. |
319 |
/* if(ret == 0), then the only sensible thing to do is to retry to |
320 |
read from stdin */
|
|
13
by Björn Påhlsson
Added following support: |
321 |
fputc('\n', stderr); |
356
by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show |
322 |
if(debug and not quit_now){ |
294
by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile |
323 |
/* 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 |
324 |
will print that later, so no need to show this too. */
|
325 |
fprintf(stderr, "getline() returned 0, retrying.\n"); |
|
326 |
} |
|
13
by Björn Påhlsson
Added following support: |
327 |
} |
257
by Teddy Hogeborn
Change the default value of the "checker" option command to make the |
328 |
|
24.1.92
by Björn Påhlsson
Several memory leaks detected by valgrind fixed |
329 |
free(buffer); |
41
by Teddy Hogeborn
Merge. |
330 |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
331 |
if(debug){ |
15.1.2
by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt |
332 |
fprintf(stderr, "Restoring terminal attributes\n"); |
333 |
} |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
334 |
if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_old) != 0){ |
13
by Björn Påhlsson
Added following support: |
335 |
perror("tcsetattr+echo"); |
336 |
} |
|
41
by Teddy Hogeborn
Merge. |
337 |
|
356
by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show |
338 |
if(quit_now){ |
339 |
sigemptyset(&old_action.sa_mask); |
|
340 |
old_action.sa_handler = SIG_DFL; |
|
341 |
ret = sigaction(signal_received, &old_action, NULL); |
|
342 |
if(ret == -1){ |
|
343 |
perror("sigaction"); |
|
344 |
} |
|
345 |
raise(signal_received); |
|
346 |
} |
|
347 |
|
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
348 |
if(debug){ |
110
by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with |
349 |
fprintf(stderr, "%s is exiting with status %d\n", argv[0], |
350 |
status); |
|
15.1.2
by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt |
351 |
} |
391
by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do |
352 |
if(status == EXIT_SUCCESS or status == EX_OK){ |
167
by Teddy Hogeborn
* plugins.d/password-prompt.c (main): If successful, output an extra |
353 |
fputc('\n', stderr); |
354 |
} |
|
13
by Björn Påhlsson
Added following support: |
355 |
|
356 |
return status; |
|
357 |
}
|