To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 237.7.221
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.221
- Committer: Teddy Hogeborn
- Date: 2014-03-23 19:55:18 UTC
- mto: (237.7.272 trunk)
- mto: This revision was merged to the branch mainline in revision 311.
- Revision ID: teddy@recompile.se-20140323195518-amvoytwi12iheypo
Make mandos-client prefer /run/tmp over /tmp.
* plugins.d/mandos-client.c (init_gpgme): Add more const.
(main): Make "tempdir" a pointer to the temporary directory, if one
has been created, or NULL. This also eliminates the need
for the "tempdir_created" variable.
* plugins.d/mandos-client.c (init_gpgme): Add more const.
(main): Make "tempdir" a pointer to the temporary directory, if one
has been created, or NULL. This also eliminates the need
for the "tempdir_created" variable.
- files added:
- DBUS-API
- debian/source
- network-hooks.d
- files modified:
- .bzrignore
added
removed
plugin-runner.c
1
/* -*- coding: utf-8 -*- */
1
/* -*- coding: utf-8; mode: c; mode: orgtbl -*- */
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 Björn Påhlsson
5
* Copyright © 2008-2013 Teddy Hogeborn
6
* Copyright © 2008-2013 Björn Påhlsson
7
7
*
8
8
* This program is free software: you can redistribute it and/or
9
9
* modify it under the terms of the GNU General Public License as
19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
21
21
*
22
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.se>.
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf() */
26
asprintf(), O_CLOEXEC */
27
27
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* perror, fileno(), fprintf(),
31
#include <stdio.h> /* fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
35
35
WEXITSTATUS(), wait(), pid_t,
36
36
uid_t, gid_t, getuid(), getgid(),
38
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
39
FD_SET(), FD_ISSET(), FD_CLR */
40
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS() */
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
42
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
43
44
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
45
46
readdir(), closedir(), dirfd() */
46
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
48
fcntl(), setuid(), setgid(),
52
53
close() */
53
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
54
55
FD_CLOEXEC */
55
#include <string.h> /* strsep, strlen(), asprintf() */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), strcmp(), strncmp() */
56
58
#include <errno.h> /* errno */
57
59
#include <argp.h> /* struct argp_option, struct
58
60
argp_state, struct argp,
62
64
#include <signal.h> /* struct sigaction, sigemptyset(),
63
65
sigaddset(), sigaction(),
64
66
sigprocmask(), SIG_BLOCK, SIGCHLD,
65
SIG_UNBLOCK, kill() */
67
SIG_UNBLOCK, kill(), sig_atomic_t
68
*/
66
69
#include <errno.h> /* errno, EBADF */
67
#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
73
#include <errno.h> /* errno */
74
#include <error.h> /* error() */
68
75
69
76
#define BUFFER_SIZE 256
70
77
72
79
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
73
80
74
81
const char *argp_program_version = "plugin-runner " VERSION;
75
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
82
const char *argp_program_bug_address = "<mandos@recompile.se>";
76
83
77
84
typedef struct plugin{
78
85
char *name; /* can be NULL or any plugin name */
81
88
char **environ;
82
89
int envc;
83
90
bool disabled;
84
91
85
92
/* Variables used for running processes*/
86
93
pid_t pid;
87
94
int fd;
89
96
size_t buffer_size;
90
97
size_t buffer_length;
91
98
bool eof;
92
volatile bool completed;
93
volatile int status;
99
volatile sig_atomic_t completed;
100
int status;
94
101
struct plugin *next;
95
102
} plugin;
96
103
98
105
99
106
/* Gets an existing plugin based on name,
100
107
or if none is found, creates a new one */
108
__attribute__((warn_unused_result))
101
109
static plugin *getplugin(char *name){
102
/* Check for exiting plugin with that name */
110
/* Check for existing plugin with that name */
103
111
for(plugin *p = plugin_list; p != NULL; p = p->next){
104
112
if((p->name == name)
105
113
or (p->name and name and (strcmp(p->name, name) == 0))){
107
115
}
108
116
}
109
117
/* Create a new plugin */
110
plugin *new_plugin = malloc(sizeof(plugin));
118
plugin *new_plugin = NULL;
119
do {
120
new_plugin = malloc(sizeof(plugin));
121
} while(new_plugin == NULL and errno == EINTR);
111
122
if(new_plugin == NULL){
112
123
return NULL;
113
124
}
114
125
char *copy_name = NULL;
115
126
if(name != NULL){
116
copy_name = strdup(name);
127
do {
128
copy_name = strdup(name);
129
} while(copy_name == NULL and errno == EINTR);
117
130
if(copy_name == NULL){
131
int e = errno;
118
132
free(new_plugin);
133
errno = e;
119
134
return NULL;
120
135
}
121
136
}
122
137
123
*new_plugin = (plugin) { .name = copy_name,
124
.argc = 1,
125
.disabled = false,
126
.next = plugin_list };
138
*new_plugin = (plugin){ .name = copy_name,
139
.argc = 1,
140
.disabled = false,
141
.next = plugin_list };
127
142
128
new_plugin->argv = malloc(sizeof(char *) * 2);
143
do {
144
new_plugin->argv = malloc(sizeof(char *) * 2);
145
} while(new_plugin->argv == NULL and errno == EINTR);
129
146
if(new_plugin->argv == NULL){
147
int e = errno;
130
148
free(copy_name);
131
149
free(new_plugin);
150
errno = e;
132
151
return NULL;
133
152
}
134
153
new_plugin->argv[0] = copy_name;
135
154
new_plugin->argv[1] = NULL;
136
155
137
new_plugin->environ = malloc(sizeof(char *));
156
do {
157
new_plugin->environ = malloc(sizeof(char *));
158
} while(new_plugin->environ == NULL and errno == EINTR);
138
159
if(new_plugin->environ == NULL){
160
int e = errno;
139
161
free(copy_name);
140
162
free(new_plugin->argv);
141
163
free(new_plugin);
164
errno = e;
142
165
return NULL;
143
166
}
144
167
new_plugin->environ[0] = NULL;
149
172
}
150
173
151
174
/* Helper function for add_argument and add_environment */
175
__attribute__((nonnull, warn_unused_result))
152
176
static bool add_to_char_array(const char *new, char ***array,
153
177
int *len){
154
178
/* Resize the pointed-to array to hold one more pointer */
155
*array = realloc(*array, sizeof(char *)
156
* (size_t) ((*len) + 2));
179
char **new_array = NULL;
180
do {
181
new_array = realloc(*array, sizeof(char *)
182
* (size_t) ((*len) + 2));
183
} while(new_array == NULL and errno == EINTR);
157
184
/* Malloc check */
158
if(*array == NULL){
185
if(new_array == NULL){
159
186
return false;
160
187
}
188
*array = new_array;
161
189
/* Make a copy of the new string */
162
char *copy = strdup(new);
190
char *copy;
191
do {
192
copy = strdup(new);
193
} while(copy == NULL and errno == EINTR);
163
194
if(copy == NULL){
164
195
return false;
165
196
}
172
203
}
173
204
174
205
/* Add to a plugin's argument vector */
206
__attribute__((nonnull(2), warn_unused_result))
175
207
static bool add_argument(plugin *p, const char *arg){
176
208
if(p == NULL){
177
209
return false;
180
212
}
181
213
182
214
/* Add to a plugin's environment */
215
__attribute__((nonnull(2), warn_unused_result))
183
216
static bool add_environment(plugin *p, const char *def, bool replace){
184
217
if(p == NULL){
185
218
return false;
187
220
/* namelen = length of name of environment variable */
188
221
size_t namelen = (size_t)(strchrnul(def, '=') - def);
189
222
/* Search for this environment variable */
190
for(char **e = p->environ; *e != NULL; e++){
191
if(strncmp(*e, def, namelen + 1) == 0){
223
for(char **envdef = p->environ; *envdef != NULL; envdef++){
224
if(strncmp(*envdef, def, namelen + 1) == 0){
192
225
/* It already exists */
193
226
if(replace){
194
char *new = realloc(*e, strlen(def) + 1);
195
if(new == NULL){
227
char *new_envdef;
228
do {
229
new_envdef = realloc(*envdef, strlen(def) + 1);
230
} while(new_envdef == NULL and errno == EINTR);
231
if(new_envdef == NULL){
196
232
return false;
197
233
}
198
*e = new;
199
strcpy(*e, def);
234
*envdef = new_envdef;
235
strcpy(*envdef, def);
200
236
}
201
237
return true;
202
238
}
207
243
/*
208
244
* Based on the example in the GNU LibC manual chapter 13.13 "File
209
245
* Descriptor Flags".
210
* *Note File Descriptor Flags:(libc)Descriptor Flags.
246
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
211
247
*/
248
__attribute__((warn_unused_result))
212
249
static int set_cloexec_flag(int fd){
213
int ret = fcntl(fd, F_GETFD, 0);
250
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
214
251
/* If reading the flags failed, return error indication now. */
215
252
if(ret < 0){
216
253
return ret;
217
254
}
218
255
/* Store modified flag word in the descriptor. */
219
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
256
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
257
ret | FD_CLOEXEC));
220
258
}
221
259
222
260
223
261
/* Mark processes as completed when they exit, and save their exit
224
262
status. */
225
263
static void handle_sigchld(__attribute__((unused)) int sig){
264
int old_errno = errno;
226
265
while(true){
227
266
plugin *proc = plugin_list;
228
267
int status;
232
271
break;
233
272
}
234
273
if(pid == -1){
235
if(errno != ECHILD){
236
perror("waitpid");
274
if(errno == ECHILD){
275
/* No child processes */
276
break;
237
277
}
238
/* No child processes */
239
break;
278
error(0, errno, "waitpid");
240
279
}
241
280
242
281
/* A child exited, find it in process_list */
248
287
continue;
249
288
}
250
289
proc->status = status;
251
proc->completed = true;
290
proc->completed = 1;
252
291
}
292
errno = old_errno;
253
293
}
254
294
255
295
/* Prints out a password to stdout */
296
__attribute__((nonnull, warn_unused_result))
256
297
static bool print_out_password(const char *buffer, size_t length){
257
298
ssize_t ret;
258
299
for(size_t written = 0; written < length; written += (size_t)ret){
266
307
}
267
308
268
309
/* Removes and free a plugin from the plugin list */
310
__attribute__((nonnull))
269
311
static void free_plugin(plugin *plugin_node){
270
312
271
313
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
277
319
}
278
320
free(plugin_node->environ);
279
321
free(plugin_node->buffer);
280
322
281
323
/* Removes the plugin from the singly-linked list */
282
324
if(plugin_node == plugin_list){
283
325
/* First one - simple */
310
352
struct dirent *dirst;
311
353
struct stat st;
312
354
fd_set rfds_all;
313
int ret, numchars, maxfd = 0;
355
int ret, maxfd = 0;
314
356
ssize_t sret;
315
intmax_t tmpmax;
316
357
uid_t uid = 65534;
317
358
gid_t gid = 65534;
318
359
bool debug = false;
327
368
sigemptyset(&sigchld_action.sa_mask);
328
369
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
329
370
if(ret == -1){
330
perror("sigaddset");
331
exitstatus = EXIT_FAILURE;
371
error(0, errno, "sigaddset");
372
exitstatus = EX_OSERR;
332
373
goto fallback;
333
374
}
334
375
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
335
376
if(ret == -1){
336
perror("sigaction");
337
exitstatus = EXIT_FAILURE;
377
error(0, errno, "sigaction");
378
exitstatus = EX_OSERR;
338
379
goto fallback;
339
380
}
340
381
372
413
.doc = "Group ID the plugins will run as", .group = 3 },
373
414
{ .name = "debug", .key = 132,
374
415
.doc = "Debug mode", .group = 4 },
416
/*
417
* These reproduce what we would get without ARGP_NO_HELP
418
*/
419
{ .name = "help", .key = '?',
420
.doc = "Give this help list", .group = -1 },
421
{ .name = "usage", .key = -3,
422
.doc = "Give a short usage message", .group = -1 },
423
{ .name = "version", .key = 'V',
424
.doc = "Print program version", .group = -1 },
375
425
{ .name = NULL }
376
426
};
377
427
378
error_t parse_opt(int key, char *arg, __attribute__((unused))
379
struct argp_state *state) {
380
switch(key) {
428
__attribute__((nonnull(3)))
429
error_t parse_opt(int key, char *arg, struct argp_state *state){
430
errno = 0;
431
switch(key){
432
char *tmp;
433
intmax_t tmp_id;
381
434
case 'g': /* --global-options */
382
if(arg != NULL){
383
char *p;
384
while((p = strsep(&arg, ",")) != NULL){
385
if(p[0] == '\0'){
386
continue;
387
}
388
if(not add_argument(getplugin(NULL), p)){
389
perror("add_argument");
390
return ARGP_ERR_UNKNOWN;
435
{
436
char *plugin_option;
437
while((plugin_option = strsep(&arg, ",")) != NULL){
438
if(not add_argument(getplugin(NULL), plugin_option)){
439
break;
391
440
}
392
441
}
442
errno = 0;
393
443
}
394
444
break;
395
445
case 'G': /* --global-env */
396
if(arg == NULL){
397
break;
398
}
399
if(not add_environment(getplugin(NULL), arg, true)){
400
perror("add_environment");
446
if(add_environment(getplugin(NULL), arg, true)){
447
errno = 0;
401
448
}
402
449
break;
403
450
case 'o': /* --options-for */
404
if(arg != NULL){
405
char *p_name = strsep(&arg, ":");
406
if(p_name[0] == '\0' or arg == NULL){
407
break;
408
}
409
char *opt = strsep(&arg, ":");
410
if(opt[0] == '\0' or opt == NULL){
411
break;
412
}
413
char *p;
414
while((p = strsep(&opt, ",")) != NULL){
415
if(p[0] == '\0'){
416
continue;
417
}
418
if(not add_argument(getplugin(p_name), p)){
419
perror("add_argument");
420
return ARGP_ERR_UNKNOWN;
421
}
422
}
451
{
452
char *option_list = strchr(arg, ':');
453
if(option_list == NULL){
454
argp_error(state, "No colon in \"%s\"", arg);
455
errno = EINVAL;
456
break;
457
}
458
*option_list = '\0';
459
option_list++;
460
if(arg[0] == '\0'){
461
argp_error(state, "Empty plugin name");
462
errno = EINVAL;
463
break;
464
}
465
char *option;
466
while((option = strsep(&option_list, ",")) != NULL){
467
if(not add_argument(getplugin(arg), option)){
468
break;
469
}
470
}
471
errno = 0;
423
472
}
424
473
break;
425
474
case 'E': /* --env-for */
426
if(arg == NULL){
427
break;
428
}
429
475
{
430
476
char *envdef = strchr(arg, ':');
431
477
if(envdef == NULL){
478
argp_error(state, "No colon in \"%s\"", arg);
479
errno = EINVAL;
432
480
break;
433
481
}
434
482
*envdef = '\0';
435
if(not add_environment(getplugin(arg), envdef+1, true)){
436
perror("add_environment");
483
envdef++;
484
if(arg[0] == '\0'){
485
argp_error(state, "Empty plugin name");
486
errno = EINVAL;
487
break;
488
}
489
if(add_environment(getplugin(arg), envdef, true)){
490
errno = 0;
437
491
}
438
492
}
439
493
break;
440
494
case 'd': /* --disable */
441
if(arg != NULL){
495
{
442
496
plugin *p = getplugin(arg);
443
if(p == NULL){
444
return ARGP_ERR_UNKNOWN;
497
if(p != NULL){
498
p->disabled = true;
499
errno = 0;
445
500
}
446
p->disabled = true;
447
501
}
448
502
break;
449
503
case 'e': /* --enable */
450
if(arg != NULL){
504
{
451
505
plugin *p = getplugin(arg);
452
if(p == NULL){
453
return ARGP_ERR_UNKNOWN;
506
if(p != NULL){
507
p->disabled = false;
508
errno = 0;
454
509
}
455
p->disabled = false;
456
510
}
457
511
break;
458
512
case 128: /* --plugin-dir */
459
513
free(plugindir);
460
514
plugindir = strdup(arg);
461
if(plugindir == NULL){
462
perror("strdup");
463
}
515
if(plugindir != NULL){
516
errno = 0;
517
}
464
518
break;
465
519
case 129: /* --config-file */
466
520
/* This is already done by parse_opt_config_file() */
467
521
break;
468
522
case 130: /* --userid */
469
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
470
if(ret < 1 or tmpmax != (uid_t)tmpmax
471
or arg[numchars] != '\0'){
472
fprintf(stderr, "Bad user ID number: \"%s\", using %"
473
PRIdMAX "\n", arg, (intmax_t)uid);
474
} else {
475
uid = (uid_t)tmpmax;
523
tmp_id = strtoimax(arg, &tmp, 10);
524
if(errno != 0 or tmp == arg or *tmp != '\0'
525
or tmp_id != (uid_t)tmp_id){
526
argp_error(state, "Bad user ID number: \"%s\", using %"
527
PRIdMAX, arg, (intmax_t)uid);
528
break;
476
529
}
530
uid = (uid_t)tmp_id;
531
errno = 0;
477
532
break;
478
533
case 131: /* --groupid */
479
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
480
if(ret < 1 or tmpmax != (gid_t)tmpmax
481
or arg[numchars] != '\0'){
482
fprintf(stderr, "Bad group ID number: \"%s\", using %"
483
PRIdMAX "\n", arg, (intmax_t)gid);
484
} else {
485
gid = (gid_t)tmpmax;
534
tmp_id = strtoimax(arg, &tmp, 10);
535
if(errno != 0 or tmp == arg or *tmp != '\0'
536
or tmp_id != (gid_t)tmp_id){
537
argp_error(state, "Bad group ID number: \"%s\", using %"
538
PRIdMAX, arg, (intmax_t)gid);
539
break;
486
540
}
541
gid = (gid_t)tmp_id;
542
errno = 0;
487
543
break;
488
544
case 132: /* --debug */
489
545
debug = true;
490
546
break;
547
/*
548
* These reproduce what we would get without ARGP_NO_HELP
549
*/
550
case '?': /* --help */
551
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
552
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
553
case -3: /* --usage */
554
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
555
argp_state_help(state, state->out_stream,
556
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
557
case 'V': /* --version */
558
fprintf(state->out_stream, "%s\n", argp_program_version);
559
exit(EXIT_SUCCESS);
560
break;
491
561
/*
492
562
* When adding more options before this line, remember to also add a
493
563
* "case" to the "parse_opt_config_file" function below.
496
566
/* Cryptsetup always passes an argument, which is an empty
497
567
string if "none" was specified in /etc/crypttab. So if
498
568
argument was empty, we ignore it silently. */
499
if(arg[0] != '\0'){
500
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
569
if(arg[0] == '\0'){
570
break;
501
571
}
502
break;
503
case ARGP_KEY_END:
504
break;
505
572
default:
506
573
return ARGP_ERR_UNKNOWN;
507
574
}
508
return 0;
575
return errno; /* Set to 0 at start */
509
576
}
510
577
511
578
/* This option parser is the same as parse_opt() above, except it
512
579
ignores everything but the --config-file option. */
513
580
error_t parse_opt_config_file(int key, char *arg,
514
581
__attribute__((unused))
515
struct argp_state *state) {
516
switch(key) {
582
struct argp_state *state){
583
errno = 0;
584
switch(key){
517
585
case 'g': /* --global-options */
518
586
case 'G': /* --global-env */
519
587
case 'o': /* --options-for */
525
593
case 129: /* --config-file */
526
594
free(argfile);
527
595
argfile = strdup(arg);
528
if(argfile == NULL){
529
perror("strdup");
596
if(argfile != NULL){
597
errno = 0;
530
598
}
531
break;
599
break;
532
600
case 130: /* --userid */
533
601
case 131: /* --groupid */
534
602
case 132: /* --debug */
603
case '?': /* --help */
604
case -3: /* --usage */
605
case 'V': /* --version */
535
606
case ARGP_KEY_ARG:
536
case ARGP_KEY_END:
537
607
break;
538
608
default:
539
609
return ARGP_ERR_UNKNOWN;
540
610
}
541
return 0;
611
return errno;
542
612
}
543
613
544
614
struct argp argp = { .options = options,
548
618
549
619
/* Parse using parse_opt_config_file() in order to get the custom
550
620
config file location, if any. */
551
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
552
if(ret == ARGP_ERR_UNKNOWN){
553
fprintf(stderr, "Unknown error while parsing arguments\n");
554
exitstatus = EXIT_FAILURE;
621
ret = argp_parse(&argp, argc, argv,
622
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
623
NULL, NULL);
624
switch(ret){
625
case 0:
626
break;
627
case ENOMEM:
628
default:
629
errno = ret;
630
error(0, errno, "argp_parse");
631
exitstatus = EX_OSERR;
632
goto fallback;
633
case EINVAL:
634
exitstatus = EX_USAGE;
555
635
goto fallback;
556
636
}
557
637
563
643
conffp = fopen(AFILE, "r");
564
644
} else {
565
645
conffp = fopen(argfile, "r");
566
}
646
}
567
647
if(conffp != NULL){
568
648
char *org_line = NULL;
569
649
char *p, *arg, *new_arg, *line;
570
650
size_t size = 0;
571
651
const char whitespace_delims[] = " \r\t\f\v\n";
572
652
const char comment_delim[] = "#";
573
653
574
654
custom_argc = 1;
575
655
custom_argv = malloc(sizeof(char*) * 2);
576
656
if(custom_argv == NULL){
577
perror("malloc");
578
exitstatus = EXIT_FAILURE;
657
error(0, errno, "malloc");
658
exitstatus = EX_OSERR;
579
659
goto fallback;
580
660
}
581
661
custom_argv[0] = argv[0];
582
662
custom_argv[1] = NULL;
583
663
584
664
/* for each line in the config file, strip whitespace and ignore
585
665
commented text */
586
666
while(true){
588
668
if(sret == -1){
589
669
break;
590
670
}
591
671
592
672
line = org_line;
593
673
arg = strsep(&line, comment_delim);
594
674
while((p = strsep(&arg, whitespace_delims)) != NULL){
597
677
}
598
678
new_arg = strdup(p);
599
679
if(new_arg == NULL){
600
perror("strdup");
601
exitstatus = EXIT_FAILURE;
680
error(0, errno, "strdup");
681
exitstatus = EX_OSERR;
602
682
free(org_line);
603
683
goto fallback;
604
684
}
605
685
606
686
custom_argc += 1;
607
custom_argv = realloc(custom_argv, sizeof(char *)
608
* ((unsigned int) custom_argc + 1));
609
if(custom_argv == NULL){
610
perror("realloc");
611
exitstatus = EXIT_FAILURE;
612
free(org_line);
613
goto fallback;
687
{
688
char **new_argv = realloc(custom_argv, sizeof(char *)
689
* ((unsigned int)
690
custom_argc + 1));
691
if(new_argv == NULL){
692
error(0, errno, "realloc");
693
exitstatus = EX_OSERR;
694
free(new_arg);
695
free(org_line);
696
goto fallback;
697
} else {
698
custom_argv = new_argv;
699
}
614
700
}
615
701
custom_argv[custom_argc-1] = new_arg;
616
custom_argv[custom_argc] = NULL;
702
custom_argv[custom_argc] = NULL;
617
703
}
618
704
}
705
do {
706
ret = fclose(conffp);
707
} while(ret == EOF and errno == EINTR);
708
if(ret == EOF){
709
error(0, errno, "fclose");
710
exitstatus = EX_IOERR;
711
goto fallback;
712
}
619
713
free(org_line);
620
714
} else {
621
715
/* Check for harmful errors and go to fallback. Other errors might
622
716
not affect opening plugins */
623
717
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
624
perror("fopen");
625
exitstatus = EXIT_FAILURE;
718
error(0, errno, "fopen");
719
exitstatus = EX_OSERR;
626
720
goto fallback;
627
721
}
628
722
}
629
/* If there was any arguments from configuration file,
630
pass them to parser as command arguments */
723
/* If there were any arguments from the configuration file, pass
724
them to parser as command line arguments */
631
725
if(custom_argv != NULL){
632
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
633
0, NULL);
634
if(ret == ARGP_ERR_UNKNOWN){
635
fprintf(stderr, "Unknown error while parsing arguments\n");
636
exitstatus = EXIT_FAILURE;
726
ret = argp_parse(&argp, custom_argc, custom_argv,
727
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
728
NULL, NULL);
729
switch(ret){
730
case 0:
731
break;
732
case ENOMEM:
733
default:
734
errno = ret;
735
error(0, errno, "argp_parse");
736
exitstatus = EX_OSERR;
737
goto fallback;
738
case EINVAL:
739
exitstatus = EX_CONFIG;
637
740
goto fallback;
638
741
}
639
742
}
640
743
641
744
/* Parse actual command line arguments, to let them override the
642
745
config file */
643
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
644
if(ret == ARGP_ERR_UNKNOWN){
645
fprintf(stderr, "Unknown error while parsing arguments\n");
646
exitstatus = EXIT_FAILURE;
746
ret = argp_parse(&argp, argc, argv,
747
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
748
NULL, NULL);
749
switch(ret){
750
case 0:
751
break;
752
case ENOMEM:
753
default:
754
errno = ret;
755
error(0, errno, "argp_parse");
756
exitstatus = EX_OSERR;
757
goto fallback;
758
case EINVAL:
759
exitstatus = EX_USAGE;
647
760
goto fallback;
648
761
}
649
762
661
774
}
662
775
}
663
776
664
/* Strip permissions down to nobody */
777
if(getuid() == 0){
778
/* Work around Debian bug #633582:
779
<http://bugs.debian.org/633582> */
780
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
781
if(plugindir_fd == -1){
782
error(0, errno, "open");
783
} else {
784
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
785
if(ret == -1){
786
error(0, errno, "fstat");
787
} else {
788
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
789
ret = fchown(plugindir_fd, uid, gid);
790
if(ret == -1){
791
error(0, errno, "fchown");
792
}
793
}
794
}
795
TEMP_FAILURE_RETRY(close(plugindir_fd));
796
}
797
}
798
799
/* Lower permissions */
800
ret = setgid(gid);
801
if(ret == -1){
802
error(0, errno, "setgid");
803
}
665
804
ret = setuid(uid);
666
805
if(ret == -1){
667
perror("setuid");
668
}
669
setgid(gid);
670
if(ret == -1){
671
perror("setgid");
672
}
673
674
if(plugindir == NULL){
675
dir = opendir(PDIR);
676
} else {
677
dir = opendir(plugindir);
678
}
679
680
if(dir == NULL){
681
perror("Could not open plugin dir");
682
exitstatus = EXIT_FAILURE;
683
goto fallback;
684
}
685
686
/* Set the FD_CLOEXEC flag on the directory, if possible */
806
error(0, errno, "setuid");
807
}
808
809
/* Open plugin directory with close_on_exec flag */
687
810
{
688
int dir_fd = dirfd(dir);
689
if(dir_fd >= 0){
690
ret = set_cloexec_flag(dir_fd);
691
if(ret < 0){
692
perror("set_cloexec_flag");
693
exitstatus = EXIT_FAILURE;
694
goto fallback;
695
}
811
int dir_fd = -1;
812
if(plugindir == NULL){
813
dir_fd = open(PDIR, O_RDONLY |
814
#ifdef O_CLOEXEC
815
O_CLOEXEC
816
#else /* not O_CLOEXEC */
817
0
818
#endif /* not O_CLOEXEC */
819
);
820
} else {
821
dir_fd = open(plugindir, O_RDONLY |
822
#ifdef O_CLOEXEC
823
O_CLOEXEC
824
#else /* not O_CLOEXEC */
825
0
826
#endif /* not O_CLOEXEC */
827
);
828
}
829
if(dir_fd == -1){
830
error(0, errno, "Could not open plugin dir");
831
exitstatus = EX_UNAVAILABLE;
832
goto fallback;
833
}
834
835
#ifndef O_CLOEXEC
836
/* Set the FD_CLOEXEC flag on the directory */
837
ret = set_cloexec_flag(dir_fd);
838
if(ret < 0){
839
error(0, errno, "set_cloexec_flag");
840
TEMP_FAILURE_RETRY(close(dir_fd));
841
exitstatus = EX_OSERR;
842
goto fallback;
843
}
844
#endif /* O_CLOEXEC */
845
846
dir = fdopendir(dir_fd);
847
if(dir == NULL){
848
error(0, errno, "Could not open plugin dir");
849
TEMP_FAILURE_RETRY(close(dir_fd));
850
exitstatus = EX_OSERR;
851
goto fallback;
696
852
}
697
853
}
698
854
700
856
701
857
/* Read and execute any executable in the plugin directory*/
702
858
while(true){
703
dirst = readdir(dir);
859
do {
860
dirst = readdir(dir);
861
} while(dirst == NULL and errno == EINTR);
704
862
705
863
/* All directory entries have been processed */
706
864
if(dirst == NULL){
707
865
if(errno == EBADF){
708
perror("readdir");
709
exitstatus = EXIT_FAILURE;
866
error(0, errno, "readdir");
867
exitstatus = EX_IOERR;
710
868
goto fallback;
711
869
}
712
870
break;
718
876
{
719
877
bool bad_name = false;
720
878
721
const char const *bad_prefixes[] = { ".", "#", NULL };
879
const char * const bad_prefixes[] = { ".", "#", NULL };
722
880
723
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
881
const char * const bad_suffixes[] = { "~", "#", ".dpkg-new",
724
882
".dpkg-old",
725
883
".dpkg-bak",
726
884
".dpkg-divert", NULL };
727
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
885
#ifdef __GNUC__
886
#pragma GCC diagnostic push
887
#pragma GCC diagnostic ignored "-Wcast-qual"
888
#endif
889
for(const char **pre = (const char **)bad_prefixes;
890
*pre != NULL; pre++){
891
#ifdef __GNUC__
892
#pragma GCC diagnostic pop
893
#endif
728
894
size_t pre_len = strlen(*pre);
729
895
if((d_name_len >= pre_len)
730
896
and strncmp((dirst->d_name), *pre, pre_len) == 0){
739
905
if(bad_name){
740
906
continue;
741
907
}
742
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
908
#ifdef __GNUC__
909
#pragma GCC diagnostic push
910
#pragma GCC diagnostic ignored "-Wcast-qual"
911
#endif
912
for(const char **suf = (const char **)bad_suffixes;
913
*suf != NULL; suf++){
914
#ifdef __GNUC__
915
#pragma GCC diagnostic pop
916
#endif
743
917
size_t suf_len = strlen(*suf);
744
918
if((d_name_len >= suf_len)
745
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
919
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
746
920
== 0)){
747
921
if(debug){
748
922
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
757
931
continue;
758
932
}
759
933
}
760
934
761
935
char *filename;
762
936
if(plugindir == NULL){
763
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
937
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
938
dirst->d_name));
764
939
} else {
765
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
940
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
941
plugindir,
942
dirst->d_name));
766
943
}
767
944
if(ret < 0){
768
perror("asprintf");
945
error(0, errno, "asprintf");
769
946
continue;
770
947
}
771
948
772
ret = stat(filename, &st);
949
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
773
950
if(ret == -1){
774
perror("stat");
951
error(0, errno, "stat");
775
952
free(filename);
776
953
continue;
777
954
}
778
955
779
956
/* Ignore non-executable files */
780
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
957
if(not S_ISREG(st.st_mode)
958
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
781
959
if(debug){
782
960
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
783
961
" with bad type or mode\n", filename);
788
966
789
967
plugin *p = getplugin(dirst->d_name);
790
968
if(p == NULL){
791
perror("getplugin");
969
error(0, errno, "getplugin");
792
970
free(filename);
793
971
continue;
794
972
}
806
984
if(g != NULL){
807
985
for(char **a = g->argv + 1; *a != NULL; a++){
808
986
if(not add_argument(p, *a)){
809
perror("add_argument");
987
error(0, errno, "add_argument");
810
988
}
811
989
}
812
990
/* Add global environment variables */
813
991
for(char **e = g->environ; *e != NULL; e++){
814
992
if(not add_environment(p, *e, false)){
815
perror("add_environment");
993
error(0, errno, "add_environment");
816
994
}
817
995
}
818
996
}
823
1001
if(p->environ[0] != NULL){
824
1002
for(char **e = environ; *e != NULL; e++){
825
1003
if(not add_environment(p, *e, false)){
826
perror("add_environment");
1004
error(0, errno, "add_environment");
827
1005
}
828
1006
}
829
1007
}
830
1008
831
1009
int pipefd[2];
832
ret = pipe(pipefd);
1010
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
833
1011
if(ret == -1){
834
perror("pipe");
835
exitstatus = EXIT_FAILURE;
1012
error(0, errno, "pipe");
1013
exitstatus = EX_OSERR;
836
1014
goto fallback;
837
1015
}
838
1016
/* Ask OS to automatic close the pipe on exec */
839
1017
ret = set_cloexec_flag(pipefd[0]);
840
1018
if(ret < 0){
841
perror("set_cloexec_flag");
842
exitstatus = EXIT_FAILURE;
1019
error(0, errno, "set_cloexec_flag");
1020
exitstatus = EX_OSERR;
843
1021
goto fallback;
844
1022
}
845
1023
ret = set_cloexec_flag(pipefd[1]);
846
1024
if(ret < 0){
847
perror("set_cloexec_flag");
848
exitstatus = EXIT_FAILURE;
1025
error(0, errno, "set_cloexec_flag");
1026
exitstatus = EX_OSERR;
849
1027
goto fallback;
850
1028
}
851
1029
/* Block SIGCHLD until process is safely in process list */
852
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1030
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1031
&sigchld_action.sa_mask,
1032
NULL));
853
1033
if(ret < 0){
854
perror("sigprocmask");
855
exitstatus = EXIT_FAILURE;
1034
error(0, errno, "sigprocmask");
1035
exitstatus = EX_OSERR;
856
1036
goto fallback;
857
1037
}
858
1038
/* Starting a new process to be watched */
859
pid_t pid = fork();
1039
pid_t pid;
1040
do {
1041
pid = fork();
1042
} while(pid == -1 and errno == EINTR);
860
1043
if(pid == -1){
861
perror("fork");
862
exitstatus = EXIT_FAILURE;
1044
error(0, errno, "fork");
1045
exitstatus = EX_OSERR;
863
1046
goto fallback;
864
1047
}
865
1048
if(pid == 0){
866
1049
/* this is the child process */
867
1050
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
868
1051
if(ret < 0){
869
perror("sigaction");
870
_exit(EXIT_FAILURE);
1052
error(0, errno, "sigaction");
1053
_exit(EX_OSERR);
871
1054
}
872
1055
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
873
1056
if(ret < 0){
874
perror("sigprocmask");
875
_exit(EXIT_FAILURE);
1057
error(0, errno, "sigprocmask");
1058
_exit(EX_OSERR);
876
1059
}
877
1060
878
1061
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
879
1062
if(ret == -1){
880
perror("dup2");
881
_exit(EXIT_FAILURE);
1063
error(0, errno, "dup2");
1064
_exit(EX_OSERR);
882
1065
}
883
1066
884
1067
if(dirfd(dir) < 0){
888
1071
}
889
1072
if(p->environ[0] == NULL){
890
1073
if(execv(filename, p->argv) < 0){
891
perror("execv");
892
_exit(EXIT_FAILURE);
1074
error(0, errno, "execv for %s", filename);
1075
_exit(EX_OSERR);
893
1076
}
894
1077
} else {
895
1078
if(execve(filename, p->argv, p->environ) < 0){
896
perror("execve");
897
_exit(EXIT_FAILURE);
1079
error(0, errno, "execve for %s", filename);
1080
_exit(EX_OSERR);
898
1081
}
899
1082
}
900
1083
/* no return */
901
1084
}
902
1085
/* Parent process */
903
close(pipefd[1]); /* Close unused write end of pipe */
1086
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1087
pipe */
904
1088
free(filename);
905
1089
plugin *new_plugin = getplugin(dirst->d_name);
906
1090
if(new_plugin == NULL){
907
perror("getplugin");
908
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1091
error(0, errno, "getplugin");
1092
ret = (int)(TEMP_FAILURE_RETRY
1093
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1094
NULL)));
909
1095
if(ret < 0){
910
perror("sigprocmask");
1096
error(0, errno, "sigprocmask");
911
1097
}
912
exitstatus = EXIT_FAILURE;
1098
exitstatus = EX_OSERR;
913
1099
goto fallback;
914
1100
}
915
1101
918
1104
919
1105
/* Unblock SIGCHLD so signal handler can be run if this process
920
1106
has already completed */
921
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1107
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1108
&sigchld_action.sa_mask,
1109
NULL));
922
1110
if(ret < 0){
923
perror("sigprocmask");
924
exitstatus = EXIT_FAILURE;
1111
error(0, errno, "sigprocmask");
1112
exitstatus = EX_OSERR;
925
1113
goto fallback;
926
1114
}
927
1115
928
FD_SET(new_plugin->fd, &rfds_all);
1116
#if defined (__GNUC__) and defined (__GLIBC__)
1117
#if not __GLIBC_PREREQ(2, 16)
1118
#pragma GCC diagnostic push
1119
#pragma GCC diagnostic ignored "-Wsign-conversion"
1120
#endif
1121
#endif
1122
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1123
-Wconversion in GNU libc
1124
before 2.16 */
1125
#if defined (__GNUC__) and defined (__GLIBC__)
1126
#if not __GLIBC_PREREQ(2, 16)
1127
#pragma GCC diagnostic pop
1128
#endif
1129
#endif
929
1130
930
1131
if(maxfd < new_plugin->fd){
931
1132
maxfd = new_plugin->fd;
932
1133
}
933
1134
}
934
1135
935
closedir(dir);
1136
TEMP_FAILURE_RETRY(closedir(dir));
936
1137
dir = NULL;
1138
free_plugin(getplugin(NULL));
937
1139
938
1140
for(plugin *p = plugin_list; p != NULL; p = p->next){
939
1141
if(p->pid != 0){
950
1152
while(plugin_list){
951
1153
fd_set rfds = rfds_all;
952
1154
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
953
if(select_ret == -1){
954
perror("select");
955
exitstatus = EXIT_FAILURE;
1155
if(select_ret == -1 and errno != EINTR){
1156
error(0, errno, "select");
1157
exitstatus = EX_OSERR;
956
1158
goto fallback;
957
1159
}
958
1160
/* OK, now either a process completed, or something can be read
959
1161
from one of them */
960
1162
for(plugin *proc = plugin_list; proc != NULL;){
961
1163
/* Is this process completely done? */
962
if(proc->eof and proc->completed){
1164
if(proc->completed and proc->eof){
963
1165
/* Only accept the plugin output if it exited cleanly */
964
1166
if(not WIFEXITED(proc->status)
965
1167
or WEXITSTATUS(proc->status) != 0){
966
1168
/* Bad exit by plugin */
967
1169
968
1170
if(debug){
969
1171
if(WIFEXITED(proc->status)){
970
fprintf(stderr, "Plugin %" PRIdMAX " exited with status"
971
" %d\n", (intmax_t) (proc->pid),
1172
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1173
" status %d\n", proc->name,
1174
(intmax_t) (proc->pid),
972
1175
WEXITSTATUS(proc->status));
973
} else if(WIFSIGNALED(proc->status)) {
974
fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"
975
" %d\n", (intmax_t) (proc->pid),
976
WTERMSIG(proc->status));
1176
} else if(WIFSIGNALED(proc->status)){
1177
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1178
" signal %d: %s\n", proc->name,
1179
(intmax_t) (proc->pid),
1180
WTERMSIG(proc->status),
1181
strsignal(WTERMSIG(proc->status)));
977
1182
} else if(WCOREDUMP(proc->status)){
978
fprintf(stderr, "Plugin %" PRIdMAX " dumped core\n",
979
(intmax_t) (proc->pid));
1183
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1184
" core\n", proc->name, (intmax_t) (proc->pid));
980
1185
}
981
1186
}
982
1187
983
1188
/* Remove the plugin */
984
FD_CLR(proc->fd, &rfds_all);
985
1189
#if defined (__GNUC__) and defined (__GLIBC__)
1190
#if not __GLIBC_PREREQ(2, 16)
1191
#pragma GCC diagnostic push
1192
#pragma GCC diagnostic ignored "-Wsign-conversion"
1193
#endif
1194
#endif
1195
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1196
-Wconversion in GNU libc
1197
before 2.16 */
1198
#if defined (__GNUC__) and defined (__GLIBC__)
1199
#if not __GLIBC_PREREQ(2, 16)
1200
#pragma GCC diagnostic pop
1201
#endif
1202
#endif
1203
986
1204
/* Block signal while modifying process_list */
987
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1205
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1206
(SIG_BLOCK,
1207
&sigchld_action.sa_mask,
1208
NULL));
988
1209
if(ret < 0){
989
perror("sigprocmask");
990
exitstatus = EXIT_FAILURE;
1210
error(0, errno, "sigprocmask");
1211
exitstatus = EX_OSERR;
991
1212
goto fallback;
992
1213
}
993
1214
996
1217
proc = next_plugin;
997
1218
998
1219
/* We are done modifying process list, so unblock signal */
999
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1000
NULL);
1220
ret = (int)(TEMP_FAILURE_RETRY
1221
(sigprocmask(SIG_UNBLOCK,
1222
&sigchld_action.sa_mask, NULL)));
1001
1223
if(ret < 0){
1002
perror("sigprocmask");
1003
exitstatus = EXIT_FAILURE;
1224
error(0, errno, "sigprocmask");
1225
exitstatus = EX_OSERR;
1004
1226
goto fallback;
1005
1227
}
1006
1228
1016
1238
bool bret = print_out_password(proc->buffer,
1017
1239
proc->buffer_length);
1018
1240
if(not bret){
1019
perror("print_out_password");
1020
exitstatus = EXIT_FAILURE;
1241
error(0, errno, "print_out_password");
1242
exitstatus = EX_IOERR;
1021
1243
}
1022
1244
goto fallback;
1023
1245
}
1024
1246
1025
1247
/* This process has not completed. Does it have any output? */
1026
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1248
#if defined (__GNUC__) and defined (__GLIBC__)
1249
#if not __GLIBC_PREREQ(2, 16)
1250
#pragma GCC diagnostic push
1251
#pragma GCC diagnostic ignored "-Wsign-conversion"
1252
#endif
1253
#endif
1254
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1255
warning from
1256
-Wconversion
1257
in GNU libc
1258
before
1259
2.16 */
1260
#if defined (__GNUC__) and defined (__GLIBC__)
1261
#if not __GLIBC_PREREQ(2, 16)
1262
#pragma GCC diagnostic pop
1263
#endif
1264
#endif
1027
1265
/* This process had nothing to say at this time */
1028
1266
proc = proc->next;
1029
1267
continue;
1030
1268
}
1031
1269
/* Before reading, make the process' data buffer large enough */
1032
1270
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1033
proc->buffer = realloc(proc->buffer, proc->buffer_size
1034
+ (size_t) BUFFER_SIZE);
1035
if(proc->buffer == NULL){
1036
perror("malloc");
1037
exitstatus = EXIT_FAILURE;
1271
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1272
+ (size_t) BUFFER_SIZE);
1273
if(new_buffer == NULL){
1274
error(0, errno, "malloc");
1275
exitstatus = EX_OSERR;
1038
1276
goto fallback;
1039
1277
}
1278
proc->buffer = new_buffer;
1040
1279
proc->buffer_size += BUFFER_SIZE;
1041
1280
}
1042
1281
/* Read from the process */
1043
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1044
BUFFER_SIZE);
1282
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1283
proc->buffer
1284
+ proc->buffer_length,
1285
BUFFER_SIZE));
1045
1286
if(sret < 0){
1046
1287
/* Read error from this process; ignore the error */
1047
1288
proc = proc->next;
1055
1296
}
1056
1297
}
1057
1298
}
1058
1059
1299
1300
1060
1301
fallback:
1061
1302
1062
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1303
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1304
and exitstatus != EX_OK)){
1063
1305
/* Fallback if all plugins failed, none are found or an error
1064
1306
occured */
1065
1307
bool bret;
1073
1315
}
1074
1316
bret = print_out_password(passwordbuffer, len);
1075
1317
if(not bret){
1076
perror("print_out_password");
1077
exitstatus = EXIT_FAILURE;
1318
error(0, errno, "print_out_password");
1319
exitstatus = EX_IOERR;
1078
1320
}
1079
1321
}
1080
1322
1081
1323
/* Restore old signal handler */
1082
1324
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1083
1325
if(ret == -1){
1084
perror("sigaction");
1085
exitstatus = EXIT_FAILURE;
1326
error(0, errno, "sigaction");
1327
exitstatus = EX_OSERR;
1086
1328
}
1087
1329
1088
1330
if(custom_argv != NULL){
1103
1345
ret = kill(p->pid, SIGTERM);
1104
1346
if(ret == -1 and errno != ESRCH){
1105
1347
/* Set-uid proccesses might not get closed */
1106
perror("kill");
1348
error(0, errno, "kill");
1107
1349
}
1108
1350
}
1109
1351
}
1110
1352
1111
1353
/* Wait for any remaining child processes to terminate */
1112
do{
1354
do {
1113
1355
ret = wait(NULL);
1114
1356
} while(ret >= 0);
1115
1357
if(errno != ECHILD){
1116
perror("wait");
1358
error(0, errno, "wait");
1117
1359
}
1118
1360
1119
1361
free_plugin_list();
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0