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