18
19
* along with this program. If not, see
19
20
* <http://www.gnu.org/licenses/>.
21
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.se>.
24
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf(), O_CLOEXEC */
26
27
#include <stddef.h> /* size_t, NULL */
27
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
28
EXIT_SUCCESS, realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
30
#include <stdbool.h> /* bool, true, false */
30
#include <stdio.h> /* perror, popen(), fileno(),
31
fprintf(), stderr, STDOUT_FILENO */
32
#include <sys/types.h> /* DIR, opendir(), stat(), struct
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
33
34
stat, waitpid(), WIFEXITED(),
34
35
WEXITSTATUS(), wait(), pid_t,
35
36
uid_t, gid_t, getuid(), getgid(),
37
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
38
39
FD_SET(), FD_ISSET(), FD_CLR */
39
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS(), WTERMSIG(),
41
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
42
44
#include <iso646.h> /* and, or, not */
43
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
44
46
readdir(), closedir(), dirfd() */
45
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
46
48
fcntl(), setuid(), setgid(),
47
49
F_GETFD, F_SETFD, FD_CLOEXEC,
48
50
access(), pipe(), fork(), close()
49
dup2, STDOUT_FILENO, _exit(),
51
dup2(), STDOUT_FILENO, _exit(),
50
52
execv(), write(), read(),
52
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
54
#include <string.h> /* strsep, strlen(), asprintf() */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), strcmp(), strncmp() */
55
58
#include <errno.h> /* errno */
56
59
#include <argp.h> /* struct argp_option, struct
57
60
argp_state, struct argp,
89
96
size_t buffer_size;
90
97
size_t buffer_length;
92
volatile bool completed;
99
volatile sig_atomic_t completed;
94
101
struct plugin *next;
97
104
static plugin *plugin_list = NULL;
99
/* Gets a existing plugin based on name,
106
/* Gets an existing plugin based on name,
100
107
or if none is found, creates a new one */
101
108
static plugin *getplugin(char *name){
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))){
109
/* Check for existing plugin with that name */
110
for(plugin *p = plugin_list; p != NULL; p = p->next){
112
or (p->name and name and (strcmp(p->name, name) == 0))){
109
116
/* Create a new plugin */
110
plugin *new_plugin = malloc(sizeof(plugin));
111
if (new_plugin == NULL){
117
plugin *new_plugin = NULL;
119
new_plugin = malloc(sizeof(plugin));
120
} while(new_plugin == NULL and errno == EINTR);
121
if(new_plugin == NULL){
114
124
char *copy_name = NULL;
115
125
if(name != NULL){
116
copy_name = strdup(name);
127
copy_name = strdup(name);
128
} while(copy_name == NULL and errno == EINTR);
117
129
if(copy_name == NULL){
122
*new_plugin = (plugin) { .name = copy_name,
125
.next = plugin_list };
127
new_plugin->argv = malloc(sizeof(char *) * 2);
128
if (new_plugin->argv == NULL){
137
*new_plugin = (plugin){ .name = copy_name,
140
.next = plugin_list };
143
new_plugin->argv = malloc(sizeof(char *) * 2);
144
} while(new_plugin->argv == NULL and errno == EINTR);
145
if(new_plugin->argv == NULL){
130
148
free(new_plugin);
133
152
new_plugin->argv[0] = copy_name;
134
153
new_plugin->argv[1] = NULL;
136
new_plugin->environ = malloc(sizeof(char *));
156
new_plugin->environ = malloc(sizeof(char *));
157
} while(new_plugin->environ == NULL and errno == EINTR);
137
158
if(new_plugin->environ == NULL){
139
161
free(new_plugin->argv);
140
162
free(new_plugin);
143
166
new_plugin->environ[0] = NULL;
344
380
{ .name = "global-options", .key = 'g',
345
381
.arg = "OPTION[,OPTION[,...]]",
346
382
.doc = "Options passed to all plugins" },
347
{ .name = "global-env", .key = 'e',
383
{ .name = "global-env", .key = 'G',
348
384
.arg = "VAR=value",
349
385
.doc = "Environment variable passed to all plugins" },
350
386
{ .name = "options-for", .key = 'o',
351
387
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
352
388
.doc = "Options passed only to specified plugin" },
353
{ .name = "env-for", .key = 'f',
389
{ .name = "env-for", .key = 'E',
354
390
.arg = "PLUGIN:ENV=value",
355
391
.doc = "Environment variable passed to specified plugin" },
356
392
{ .name = "disable", .key = 'd',
358
394
.doc = "Disable a specific plugin", .group = 1 },
395
{ .name = "enable", .key = 'e',
397
.doc = "Enable a specific plugin", .group = 1 },
359
398
{ .name = "plugin-dir", .key = 128,
360
399
.arg = "DIRECTORY",
361
400
.doc = "Specify a different plugin directory", .group = 2 },
370
409
.doc = "Group ID the plugins will run as", .group = 3 },
371
410
{ .name = "debug", .key = 132,
372
411
.doc = "Debug mode", .group = 4 },
413
* These reproduce what we would get without ARGP_NO_HELP
415
{ .name = "help", .key = '?',
416
.doc = "Give this help list", .group = -1 },
417
{ .name = "usage", .key = -3,
418
.doc = "Give a short usage message", .group = -1 },
419
{ .name = "version", .key = 'V',
420
.doc = "Print program version", .group = -1 },
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. */
424
__attribute__((nonnull(3)))
425
error_t parse_opt(int key, char *arg, struct argp_state *state){
381
430
case 'g': /* --global-options */
384
while((p = strsep(&arg, ",")) != NULL){
388
if(not add_argument(getplugin(NULL), p)){
389
perror("add_argument");
390
return ARGP_ERR_UNKNOWN;
395
case 'e': /* --global-env */
400
char *envdef = strdup(arg);
404
if(not add_environment(getplugin(NULL), envdef, true)){
405
perror("add_environment");
433
while((plugin_option = strsep(&arg, ",")) != NULL){
434
if(not add_argument(getplugin(NULL), plugin_option)){
440
case 'G': /* --global-env */
441
add_environment(getplugin(NULL), arg, true);
409
443
case 'o': /* --options-for */
411
char *p_name = strsep(&arg, ":");
412
if(p_name[0] == '\0'){
415
char *opt = strsep(&arg, ":");
421
while((p = strsep(&opt, ",")) != NULL){
425
if(not add_argument(getplugin(p_name), p)){
426
perror("add_argument");
427
return ARGP_ERR_UNKNOWN;
445
char *option_list = strchr(arg, ':');
446
if(option_list == NULL){
447
argp_error(state, "No colon in \"%s\"", arg);
454
argp_error(state, "Empty plugin name");
459
while((option = strsep(&option_list, ",")) != NULL){
460
if(not add_argument(getplugin(arg), option)){
433
case 'f': /* --env-for */
466
case 'E': /* --env-for */
438
468
char *envdef = strchr(arg, ':');
439
469
if(envdef == NULL){
442
char *p_name = strndup(arg, (size_t) (envdef-arg));
470
argp_error(state, "No colon in \"%s\"", arg);
447
if(not add_environment(getplugin(p_name), envdef, true)){
448
perror("add_environment");
477
argp_error(state, "Empty plugin name");
481
add_environment(getplugin(arg), envdef, true);
452
484
case 'd': /* --disable */
454
plugin *p = getplugin(arg);
456
return ARGP_ERR_UNKNOWN;
486
plugin *p = getplugin(arg);
492
case 'e': /* --enable */
494
plugin *p = getplugin(arg);
461
500
case 128: /* --plugin-dir */
462
502
plugindir = strdup(arg);
463
if(plugindir == NULL){
467
case 129: /* --config-file */
504
case 129: /* --config-file */
505
/* This is already done by parse_opt_config_file() */
507
case 130: /* --userid */
508
tmp_id = strtoimax(arg, &tmp, 10);
509
if(errno != 0 or tmp == arg or *tmp != '\0'
510
or tmp_id != (uid_t)tmp_id){
511
argp_error(state, "Bad user ID number: \"%s\", using %"
512
PRIdMAX, arg, (intmax_t)uid);
517
case 131: /* --groupid */
518
tmp_id = strtoimax(arg, &tmp, 10);
519
if(errno != 0 or tmp == arg or *tmp != '\0'
520
or tmp_id != (gid_t)tmp_id){
521
argp_error(state, "Bad group ID number: \"%s\", using %"
522
PRIdMAX, arg, (intmax_t)gid);
527
case 132: /* --debug */
531
* These reproduce what we would get without ARGP_NO_HELP
533
case '?': /* --help */
534
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
535
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
536
case -3: /* --usage */
537
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
538
argp_state_help(state, state->out_stream,
539
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
540
case 'V': /* --version */
541
fprintf(state->out_stream, "%s\n", argp_program_version);
545
* When adding more options before this line, remember to also add a
546
* "case" to the "parse_opt_config_file" function below.
549
/* Cryptsetup always passes an argument, which is an empty
550
string if "none" was specified in /etc/crypttab. So if
551
argument was empty, we ignore it silently. */
556
return ARGP_ERR_UNKNOWN;
558
return errno; /* Set to 0 at start */
561
/* This option parser is the same as parse_opt() above, except it
562
ignores everything but the --config-file option. */
563
error_t parse_opt_config_file(int key, char *arg,
564
__attribute__((unused))
565
struct argp_state *state){
568
case 'g': /* --global-options */
569
case 'G': /* --global-env */
570
case 'o': /* --options-for */
571
case 'E': /* --env-for */
572
case 'd': /* --disable */
573
case 'e': /* --enable */
574
case 128: /* --plugin-dir */
576
case 129: /* --config-file */
468
578
argfile = strdup(arg);
473
580
case 130: /* --userid */
474
uid = (uid_t)strtol(arg, NULL, 10);
476
581
case 131: /* --groupid */
477
gid = (gid_t)strtol(arg, NULL, 10);
479
582
case 132: /* --debug */
583
case '?': /* --help */
584
case -3: /* --usage */
585
case 'V': /* --version */
482
586
case ARGP_KEY_ARG:
483
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
488
589
return ARGP_ERR_UNKNOWN;
493
struct argp argp = { .options = options, .parser = parse_opt,
594
struct argp argp = { .options = options,
595
.parser = parse_opt_config_file,
495
597
.doc = "Mandos plugin runner -- Run plugins" };
599
/* Parse using parse_opt_config_file() in order to get the custom
600
config file location, if any. */
601
ret = argp_parse(&argp, argc, argv,
602
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
610
error(0, errno, "argp_parse");
611
exitstatus = EX_OSERR;
614
exitstatus = EX_USAGE;
618
/* Reset to the normal argument parser */
619
argp.parser = parse_opt;
497
621
/* Open the configfile if available */
498
if (argfile == NULL){
499
623
conffp = fopen(AFILE, "r");
501
625
conffp = fopen(argfile, "r");
503
627
if(conffp != NULL){
504
628
char *org_line = NULL;
505
629
char *p, *arg, *new_arg, *line;
508
631
const char whitespace_delims[] = " \r\t\f\v\n";
509
632
const char comment_delim[] = "#";
512
635
custom_argv = malloc(sizeof(char*) * 2);
513
636
if(custom_argv == NULL){
515
exitstatus = EXIT_FAILURE;
637
error(0, errno, "malloc");
638
exitstatus = EX_OSERR;
518
641
custom_argv[0] = argv[0];
519
642
custom_argv[1] = NULL;
521
644
/* for each line in the config file, strip whitespace and ignore
522
645
commented text */
544
667
custom_argv = realloc(custom_argv, sizeof(char *)
545
668
* ((unsigned int) custom_argc + 1));
546
669
if(custom_argv == NULL){
548
exitstatus = EXIT_FAILURE;
670
error(0, errno, "realloc");
671
exitstatus = EX_OSERR;
552
675
custom_argv[custom_argc-1] = new_arg;
553
custom_argv[custom_argc] = NULL;
676
custom_argv[custom_argc] = NULL;
680
ret = fclose(conffp);
681
} while(ret == EOF and errno == EINTR);
683
error(0, errno, "fclose");
684
exitstatus = EX_IOERR;
558
689
/* Check for harmful errors and go to fallback. Other errors might
559
690
not affect opening plugins */
560
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
562
exitstatus = EXIT_FAILURE;
691
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
692
error(0, errno, "fopen");
693
exitstatus = EX_OSERR;
566
/* If there was any arguments from configuration file,
567
pass them to parser as command arguments */
697
/* If there were any arguments from the configuration file, pass
698
them to parser as command line arguments */
568
699
if(custom_argv != NULL){
569
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
571
if (ret == ARGP_ERR_UNKNOWN){
572
fprintf(stderr, "Unknown error while parsing arguments\n");
573
exitstatus = EXIT_FAILURE;
700
ret = argp_parse(&argp, custom_argc, custom_argv,
701
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
709
error(0, errno, "argp_parse");
710
exitstatus = EX_OSERR;
713
exitstatus = EX_CONFIG;
578
718
/* Parse actual command line arguments, to let them override the
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;
720
ret = argp_parse(&argp, argc, argv,
721
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
729
error(0, errno, "argp_parse");
730
exitstatus = EX_OSERR;
733
exitstatus = EX_USAGE;
591
741
for(char **a = p->argv; *a != NULL; a++){
592
742
fprintf(stderr, "\tArg: %s\n", *a);
594
fprintf(stderr, "...and %u environment variables\n", p->envc);
744
fprintf(stderr, "...and %d environment variables\n", p->envc);
595
745
for(char **a = p->environ; *a != NULL; a++){
596
746
fprintf(stderr, "\t%s\n", *a);
601
/* Strip permissions down to nobody */
752
/* Work around Debian bug #633582:
753
<http://bugs.debian.org/633582> */
754
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
755
if(plugindir_fd == -1){
756
error(0, errno, "open");
758
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
760
error(0, errno, "fstat");
762
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
763
ret = fchown(plugindir_fd, uid, gid);
765
error(0, errno, "fchown");
769
TEMP_FAILURE_RETRY(close(plugindir_fd));
773
/* Lower permissions */
776
error(0, errno, "setgid");
602
778
ret = setuid(uid);
611
if (plugindir == NULL){
614
dir = opendir(plugindir);
618
perror("Could not open plugin dir");
619
exitstatus = EXIT_FAILURE;
623
/* Set the FD_CLOEXEC flag on the directory, if possible */
780
error(0, errno, "setuid");
783
/* Open plugin directory with close_on_exec flag */
625
int dir_fd = dirfd(dir);
627
ret = set_cloexec_flag(dir_fd);
629
perror("set_cloexec_flag");
630
exitstatus = EXIT_FAILURE;
786
if(plugindir == NULL){
787
dir_fd = open(PDIR, O_RDONLY |
790
#else /* not O_CLOEXEC */
792
#endif /* not O_CLOEXEC */
795
dir_fd = open(plugindir, O_RDONLY |
798
#else /* not O_CLOEXEC */
800
#endif /* not O_CLOEXEC */
804
error(0, errno, "Could not open plugin dir");
805
exitstatus = EX_UNAVAILABLE;
810
/* Set the FD_CLOEXEC flag on the directory */
811
ret = set_cloexec_flag(dir_fd);
813
error(0, errno, "set_cloexec_flag");
814
TEMP_FAILURE_RETRY(close(dir_fd));
815
exitstatus = EX_OSERR;
818
#endif /* O_CLOEXEC */
820
dir = fdopendir(dir_fd);
822
error(0, errno, "Could not open plugin dir");
823
TEMP_FAILURE_RETRY(close(dir_fd));
824
exitstatus = EX_OSERR;
755
959
if(p->environ[0] != NULL){
756
960
for(char **e = environ; *e != NULL; e++){
757
961
if(not add_environment(p, *e, false)){
758
perror("add_environment");
962
error(0, errno, "add_environment");
767
exitstatus = EXIT_FAILURE;
968
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
970
error(0, errno, "pipe");
971
exitstatus = EX_OSERR;
770
974
/* Ask OS to automatic close the pipe on exec */
771
975
ret = set_cloexec_flag(pipefd[0]);
773
perror("set_cloexec_flag");
774
exitstatus = EXIT_FAILURE;
977
error(0, errno, "set_cloexec_flag");
978
exitstatus = EX_OSERR;
777
981
ret = set_cloexec_flag(pipefd[1]);
779
perror("set_cloexec_flag");
780
exitstatus = EXIT_FAILURE;
983
error(0, errno, "set_cloexec_flag");
984
exitstatus = EX_OSERR;
783
987
/* Block SIGCHLD until process is safely in process list */
784
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
988
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
989
&sigchld_action.sa_mask,
786
perror("sigprocmask");
787
exitstatus = EXIT_FAILURE;
992
error(0, errno, "sigprocmask");
993
exitstatus = EX_OSERR;
790
996
/* Starting a new process to be watched */
1000
} while(pid == -1 and errno == EINTR);
794
exitstatus = EXIT_FAILURE;
1002
error(0, errno, "fork");
1003
exitstatus = EX_OSERR;
798
1007
/* this is the child process */
799
1008
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1010
error(0, errno, "sigaction");
804
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1013
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
806
perror("sigprocmask");
1015
error(0, errno, "sigprocmask");
810
1019
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1021
error(0, errno, "dup2");
816
1025
if(dirfd(dir) < 0){
878
1093
free_plugin_list();
882
1097
/* Main loop while running plugins exist */
883
1098
while(plugin_list){
884
1099
fd_set rfds = rfds_all;
885
1100
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
886
if (select_ret == -1){
888
exitstatus = EXIT_FAILURE;
1101
if(select_ret == -1 and errno != EINTR){
1102
error(0, errno, "select");
1103
exitstatus = EX_OSERR;
891
1106
/* OK, now either a process completed, or something can be read
892
1107
from one of them */
893
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
1108
for(plugin *proc = plugin_list; proc != NULL;){
894
1109
/* Is this process completely done? */
895
if(proc->eof and proc->completed){
1110
if(proc->completed and proc->eof){
896
1111
/* Only accept the plugin output if it exited cleanly */
897
1112
if(not WIFEXITED(proc->status)
898
1113
or WEXITSTATUS(proc->status) != 0){
899
1114
/* Bad exit by plugin */
902
1117
if(WIFEXITED(proc->status)){
903
fprintf(stderr, "Plugin %u exited with status %d\n",
904
(unsigned int) (proc->pid),
1118
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1119
" status %d\n", proc->name,
1120
(intmax_t) (proc->pid),
905
1121
WEXITSTATUS(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));
1122
} else if(WIFSIGNALED(proc->status)){
1123
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1124
" signal %d: %s\n", proc->name,
1125
(intmax_t) (proc->pid),
1126
WTERMSIG(proc->status),
1127
strsignal(WTERMSIG(proc->status)));
910
1128
} else if(WCOREDUMP(proc->status)){
911
fprintf(stderr, "Plugin %d dumped core\n",
912
(unsigned int) (proc->pid));
1129
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1130
" core\n", proc->name, (intmax_t) (proc->pid));
916
1134
/* Remove the plugin */
917
FD_CLR(proc->fd, &rfds_all);
1135
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
919
1138
/* Block signal while modifying process_list */
920
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1139
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1141
&sigchld_action.sa_mask,
922
perror("sigprocmask");
923
exitstatus = EXIT_FAILURE;
1144
error(0, errno, "sigprocmask");
1145
exitstatus = EX_OSERR;
1149
plugin *next_plugin = proc->next;
926
1150
free_plugin(proc);
927
1153
/* We are done modifying process list, so unblock signal */
928
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
1154
ret = (int)(TEMP_FAILURE_RETRY
1155
(sigprocmask(SIG_UNBLOCK,
1156
&sigchld_action.sa_mask, NULL)));
931
perror("sigprocmask");
932
exitstatus = EXIT_FAILURE;
1158
error(0, errno, "sigprocmask");
1159
exitstatus = EX_OSERR;
936
1163
if(plugin_list == NULL){
942
1170
/* This process exited nicely, so print its buffer */
944
1172
bool bret = print_out_password(proc->buffer,
945
1173
proc->buffer_length);
947
perror("print_out_password");
948
exitstatus = EXIT_FAILURE;
1175
error(0, errno, "print_out_password");
1176
exitstatus = EX_IOERR;
953
1181
/* This process has not completed. Does it have any output? */
954
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1182
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
955
1185
/* This process had nothing to say at this time */
958
1189
/* Before reading, make the process' data buffer large enough */
959
1190
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
960
1191
proc->buffer = realloc(proc->buffer, proc->buffer_size
961
1192
+ (size_t) BUFFER_SIZE);
962
if (proc->buffer == NULL){
964
exitstatus = EXIT_FAILURE;
1193
if(proc->buffer == NULL){
1194
error(0, errno, "malloc");
1195
exitstatus = EX_OSERR;
967
1198
proc->buffer_size += BUFFER_SIZE;
969
1200
/* Read from the process */
970
ret = read(proc->fd, proc->buffer + proc->buffer_length,
1201
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1203
+ proc->buffer_length,
973
1206
/* Read error from this process; ignore the error */
978
1212
proc->eof = true;
980
proc->buffer_length += (size_t) ret;
1214
proc->buffer_length += (size_t) sret;
988
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1222
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1223
and exitstatus != EX_OK)){
989
1224
/* Fallback if all plugins failed, none are found or an error
992
1227
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
993
1228
char *passwordbuffer = getpass("Password: ");
994
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
1229
size_t len = strlen(passwordbuffer);
1230
/* Strip trailing newline */
1231
if(len > 0 and passwordbuffer[len-1] == '\n'){
1232
passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1235
bret = print_out_password(passwordbuffer, len);
996
perror("print_out_password");
997
exitstatus = EXIT_FAILURE;
1237
error(0, errno, "print_out_password");
1238
exitstatus = EX_IOERR;
1001
1242
/* Restore old signal handler */
1002
1243
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1004
perror("sigaction");
1005
exitstatus = EXIT_FAILURE;
1245
error(0, errno, "sigaction");
1246
exitstatus = EX_OSERR;
1008
1249
if(custom_argv != NULL){
1009
1250
for(char **arg = custom_argv+1; *arg != NULL; arg++){