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;
336
375
{ .name = "global-options", .key = 'g',
337
376
.arg = "OPTION[,OPTION[,...]]",
338
377
.doc = "Options passed to all plugins" },
339
{ .name = "global-env", .key = 'e',
378
{ .name = "global-env", .key = 'G',
340
379
.arg = "VAR=value",
341
380
.doc = "Environment variable passed to all plugins" },
342
381
{ .name = "options-for", .key = 'o',
343
382
.arg = "PLUGIN:OPTION[,OPTION[,...]]",
344
383
.doc = "Options passed only to specified plugin" },
345
{ .name = "env-for", .key = 'f',
384
{ .name = "env-for", .key = 'E',
346
385
.arg = "PLUGIN:ENV=value",
347
386
.doc = "Environment variable passed to specified plugin" },
348
387
{ .name = "disable", .key = 'd',
350
389
.doc = "Disable a specific plugin", .group = 1 },
390
{ .name = "enable", .key = 'e',
392
.doc = "Enable a specific plugin", .group = 1 },
351
393
{ .name = "plugin-dir", .key = 128,
352
394
.arg = "DIRECTORY",
353
395
.doc = "Specify a different plugin directory", .group = 2 },
362
404
.doc = "Group ID the plugins will run as", .group = 3 },
363
405
{ .name = "debug", .key = 132,
364
406
.doc = "Debug mode", .group = 4 },
408
* These reproduce what we would get without ARGP_NO_HELP
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 },
368
error_t parse_opt (int key, char *arg, __attribute__((unused))
369
struct argp_state *state) {
370
/* Get the INPUT argument from `argp_parse', which we know is a
371
pointer to our plugin list pointer. */
419
error_t parse_opt(int key, char *arg, struct argp_state *state){
373
424
case 'g': /* --global-options */
376
while((p = strsep(&arg, ",")) != NULL){
380
if(not add_argument(getplugin(NULL), p)){
381
perror("add_argument");
382
return ARGP_ERR_UNKNOWN;
387
case 'e': /* --global-env */
392
char *envdef = strdup(arg);
396
if(not add_environment(getplugin(NULL), envdef)){
397
perror("add_environment");
427
while((plugin_option = strsep(&arg, ",")) != NULL){
428
if(not add_argument(getplugin(NULL), plugin_option)){
434
case 'G': /* --global-env */
435
add_environment(getplugin(NULL), arg, true);
401
437
case 'o': /* --options-for */
403
char *p_name = strsep(&arg, ":");
404
if(p_name[0] == '\0'){
407
char *opt = strsep(&arg, ":");
413
while((p = strsep(&opt, ",")) != NULL){
417
if(not add_argument(getplugin(p_name), p)){
418
perror("add_argument");
419
return ARGP_ERR_UNKNOWN;
439
char *option_list = strchr(arg, ':');
440
if(option_list == NULL){
441
argp_error(state, "No colon in \"%s\"", arg);
448
argp_error(state, "Empty plugin name");
453
while((option = strsep(&option_list, ",")) != NULL){
454
if(not add_argument(getplugin(arg), option)){
425
case 'f': /* --env-for */
460
case 'E': /* --env-for */
430
462
char *envdef = strchr(arg, ':');
431
463
if(envdef == NULL){
434
char *p_name = strndup(arg, (size_t) (envdef-arg));
464
argp_error(state, "No colon in \"%s\"", arg);
439
if(not add_environment(getplugin(p_name), envdef)){
440
perror("add_environment");
471
argp_error(state, "Empty plugin name");
475
add_environment(getplugin(arg), envdef, true);
444
478
case 'd': /* --disable */
446
plugin *p = getplugin(arg);
448
return ARGP_ERR_UNKNOWN;
480
plugin *p = getplugin(arg);
486
case 'e': /* --enable */
488
plugin *p = getplugin(arg);
453
494
case 128: /* --plugin-dir */
454
496
plugindir = strdup(arg);
455
if(plugindir == NULL){
459
case 129: /* --config-file */
498
case 129: /* --config-file */
499
/* This is already done by parse_opt_config_file() */
501
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);
511
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);
521
case 132: /* --debug */
525
* These reproduce what we would get without ARGP_NO_HELP
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);
539
* When adding more options before this line, remember to also add a
540
* "case" to the "parse_opt_config_file" function below.
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. */
550
return ARGP_ERR_UNKNOWN;
552
return errno; /* Set to 0 at start */
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){
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 */
570
case 129: /* --config-file */
460
572
argfile = strdup(arg);
465
574
case 130: /* --userid */
466
uid = (uid_t)strtol(arg, NULL, 10);
468
575
case 131: /* --groupid */
469
gid = (gid_t)strtol(arg, NULL, 10);
471
576
case 132: /* --debug */
577
case '?': /* --help */
578
case -3: /* --usage */
579
case 'V': /* --version */
474
580
case ARGP_KEY_ARG:
475
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
480
583
return ARGP_ERR_UNKNOWN;
485
struct argp argp = { .options = options, .parser = parse_opt,
486
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
588
struct argp argp = { .options = options,
589
.parser = parse_opt_config_file,
487
591
.doc = "Mandos plugin runner -- Run plugins" };
489
ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
490
if (ret == ARGP_ERR_UNKNOWN){
491
fprintf(stderr, "Unknown error while parsing arguments\n");
492
exitstatus = EXIT_FAILURE;
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,
604
error(0, errno, "argp_parse");
605
exitstatus = EX_OSERR;
608
exitstatus = EX_USAGE;
496
/* Opens the configfile if aviable */
497
if (argfile == NULL){
612
/* Reset to the normal argument parser */
613
argp.parser = parse_opt;
615
/* Open the configfile if available */
498
617
conffp = fopen(AFILE, "r");
500
619
conffp = fopen(argfile, "r");
502
621
if(conffp != NULL){
503
622
char *org_line = NULL;
504
623
char *p, *arg, *new_arg, *line;
507
625
const char whitespace_delims[] = " \r\t\f\v\n";
508
626
const char comment_delim[] = "#";
511
629
custom_argv = malloc(sizeof(char*) * 2);
512
630
if(custom_argv == NULL){
514
exitstatus = EXIT_FAILURE;
631
error(0, errno, "malloc");
632
exitstatus = EX_OSERR;
517
635
custom_argv[0] = argv[0];
518
636
custom_argv[1] = NULL;
520
638
/* for each line in the config file, strip whitespace and ignore
521
639
commented text */
543
661
custom_argv = realloc(custom_argv, sizeof(char *)
544
662
* ((unsigned int) custom_argc + 1));
545
663
if(custom_argv == NULL){
547
exitstatus = EXIT_FAILURE;
664
error(0, errno, "realloc");
665
exitstatus = EX_OSERR;
551
669
custom_argv[custom_argc-1] = new_arg;
552
custom_argv[custom_argc] = NULL;
670
custom_argv[custom_argc] = NULL;
674
ret = fclose(conffp);
675
} while(ret == EOF and errno == EINTR);
677
error(0, errno, "fclose");
678
exitstatus = EX_IOERR;
557
683
/* Check for harmful errors and go to fallback. Other errors might
558
684
not affect opening plugins */
559
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
561
exitstatus = EXIT_FAILURE;
685
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
686
error(0, errno, "fopen");
687
exitstatus = EX_OSERR;
565
/* If there was any arguments from configuration file,
566
pass them to parser as command arguments */
691
/* If there were any arguments from the configuration file, pass
692
them to parser as command line arguments */
567
693
if(custom_argv != NULL){
568
ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, NULL);
569
if (ret == ARGP_ERR_UNKNOWN){
570
fprintf(stderr, "Unknown error while parsing arguments\n");
571
exitstatus = EXIT_FAILURE;
694
ret = argp_parse(&argp, custom_argc, custom_argv,
695
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
703
error(0, errno, "argp_parse");
704
exitstatus = EX_OSERR;
707
exitstatus = EX_CONFIG;
712
/* Parse actual command line arguments, to let them override the
714
ret = argp_parse(&argp, argc, argv,
715
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
723
error(0, errno, "argp_parse");
724
exitstatus = EX_OSERR;
727
exitstatus = EX_USAGE;
577
732
for(plugin *p = plugin_list; p != NULL; p=p->next){
578
733
fprintf(stderr, "Plugin: %s has %d arguments\n",
580
735
for(char **a = p->argv; *a != NULL; a++){
581
736
fprintf(stderr, "\tArg: %s\n", *a);
583
fprintf(stderr, "...and %u environment variables\n", p->envc);
738
fprintf(stderr, "...and %d environment variables\n", p->envc);
584
739
for(char **a = p->environ; *a != NULL; a++){
585
740
fprintf(stderr, "\t%s\n", *a);
590
/* Strip permissions down to nobody */
746
/* Work around Debian bug #633582:
747
<http://bugs.debian.org/633582> */
748
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
749
if(plugindir_fd == -1){
750
error(0, errno, "open");
752
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
754
error(0, errno, "fstat");
756
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
757
ret = fchown(plugindir_fd, uid, gid);
759
error(0, errno, "fchown");
763
TEMP_FAILURE_RETRY(close(plugindir_fd));
767
/* Lower permissions */
770
error(0, errno, "setgid");
591
772
ret = setuid(uid);
600
if (plugindir == NULL){
603
dir = opendir(plugindir);
607
perror("Could not open plugin dir");
608
exitstatus = EXIT_FAILURE;
612
/* Set the FD_CLOEXEC flag on the directory, if possible */
774
error(0, errno, "setuid");
777
/* Open plugin directory with close_on_exec flag */
614
int dir_fd = dirfd(dir);
616
ret = set_cloexec_flag(dir_fd);
618
perror("set_cloexec_flag");
619
exitstatus = EXIT_FAILURE;
780
if(plugindir == NULL){
781
dir_fd = open(PDIR, O_RDONLY |
784
#else /* not O_CLOEXEC */
786
#endif /* not O_CLOEXEC */
789
dir_fd = open(plugindir, O_RDONLY |
792
#else /* not O_CLOEXEC */
794
#endif /* not O_CLOEXEC */
798
error(0, errno, "Could not open plugin dir");
799
exitstatus = EX_UNAVAILABLE;
804
/* Set the FD_CLOEXEC flag on the directory */
805
ret = set_cloexec_flag(dir_fd);
807
error(0, errno, "set_cloexec_flag");
808
TEMP_FAILURE_RETRY(close(dir_fd));
809
exitstatus = EX_OSERR;
812
#endif /* O_CLOEXEC */
814
dir = fdopendir(dir_fd);
816
error(0, errno, "Could not open plugin dir");
817
TEMP_FAILURE_RETRY(close(dir_fd));
818
exitstatus = EX_OSERR;
625
823
FD_ZERO(&rfds_all);
627
825
/* Read and execute any executable in the plugin directory*/
629
dirst = readdir(dir);
828
dirst = readdir(dir);
829
} while(dirst == NULL and errno == EINTR);
631
// All directory entries have been processed
831
/* All directory entries have been processed */
632
832
if(dirst == NULL){
635
exitstatus = EXIT_FAILURE;
834
error(0, errno, "readdir");
835
exitstatus = EX_IOERR;
744
953
if(p->environ[0] != NULL){
745
954
for(char **e = environ; *e != NULL; e++){
746
char *copy = strdup(*e);
751
if(not add_environment(p, copy)){
752
perror("add_environment");
955
if(not add_environment(p, *e, false)){
956
error(0, errno, "add_environment");
761
exitstatus = EXIT_FAILURE;
962
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
964
error(0, errno, "pipe");
965
exitstatus = EX_OSERR;
764
968
/* Ask OS to automatic close the pipe on exec */
765
969
ret = set_cloexec_flag(pipefd[0]);
767
perror("set_cloexec_flag");
768
exitstatus = EXIT_FAILURE;
971
error(0, errno, "set_cloexec_flag");
972
exitstatus = EX_OSERR;
771
975
ret = set_cloexec_flag(pipefd[1]);
773
perror("set_cloexec_flag");
774
exitstatus = EXIT_FAILURE;
977
error(0, errno, "set_cloexec_flag");
978
exitstatus = EX_OSERR;
777
981
/* Block SIGCHLD until process is safely in process list */
778
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
982
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
983
&sigchld_action.sa_mask,
780
perror("sigprocmask");
781
exitstatus = EXIT_FAILURE;
986
error(0, errno, "sigprocmask");
987
exitstatus = EX_OSERR;
784
// Starting a new process to be watched
990
/* Starting a new process to be watched */
994
} while(pid == -1 and errno == EINTR);
788
exitstatus = EXIT_FAILURE;
996
error(0, errno, "fork");
997
exitstatus = EX_OSERR;
792
1001
/* this is the child process */
793
1002
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1004
error(0, errno, "sigaction");
798
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1007
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
800
perror("sigprocmask");
1009
error(0, errno, "sigprocmask");
804
1013
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1015
error(0, errno, "dup2");
810
1019
if(dirfd(dir) < 0){
872
1087
free_plugin_list();
876
1091
/* Main loop while running plugins exist */
877
1092
while(plugin_list){
878
1093
fd_set rfds = rfds_all;
879
1094
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
880
if (select_ret == -1){
882
exitstatus = EXIT_FAILURE;
1095
if(select_ret == -1 and errno != EINTR){
1096
error(0, errno, "select");
1097
exitstatus = EX_OSERR;
885
1100
/* OK, now either a process completed, or something can be read
886
1101
from one of them */
887
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
1102
for(plugin *proc = plugin_list; proc != NULL;){
888
1103
/* Is this process completely done? */
889
if(proc->eof and proc->completed){
1104
if(proc->completed and proc->eof){
890
1105
/* Only accept the plugin output if it exited cleanly */
891
1106
if(not WIFEXITED(proc->status)
892
1107
or WEXITSTATUS(proc->status) != 0){
893
1108
/* Bad exit by plugin */
896
1111
if(WIFEXITED(proc->status)){
897
fprintf(stderr, "Plugin %u exited with status %d\n",
898
(unsigned int) (proc->pid),
1112
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1113
" status %d\n", proc->name,
1114
(intmax_t) (proc->pid),
899
1115
WEXITSTATUS(proc->status));
900
} else if(WIFSIGNALED(proc->status)) {
901
fprintf(stderr, "Plugin %u killed by signal %d\n",
902
(unsigned int) (proc->pid),
903
WTERMSIG(proc->status));
1116
} else if(WIFSIGNALED(proc->status)){
1117
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1118
" signal %d: %s\n", proc->name,
1119
(intmax_t) (proc->pid),
1120
WTERMSIG(proc->status),
1121
strsignal(WTERMSIG(proc->status)));
904
1122
} else if(WCOREDUMP(proc->status)){
905
fprintf(stderr, "Plugin %d dumped core\n",
906
(unsigned int) (proc->pid));
1123
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1124
" core\n", proc->name, (intmax_t) (proc->pid));
910
1128
/* Remove the plugin */
911
FD_CLR(proc->fd, &rfds_all);
1129
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
913
1132
/* Block signal while modifying process_list */
914
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1133
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1135
&sigchld_action.sa_mask,
916
perror("sigprocmask");
917
exitstatus = EXIT_FAILURE;
1138
error(0, errno, "sigprocmask");
1139
exitstatus = EX_OSERR;
1143
plugin *next_plugin = proc->next;
920
1144
free_plugin(proc);
921
1147
/* We are done modifying process list, so unblock signal */
922
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
1148
ret = (int)(TEMP_FAILURE_RETRY
1149
(sigprocmask(SIG_UNBLOCK,
1150
&sigchld_action.sa_mask, NULL)));
925
perror("sigprocmask");
926
exitstatus = EXIT_FAILURE;
1152
error(0, errno, "sigprocmask");
1153
exitstatus = EX_OSERR;
930
1157
if(plugin_list == NULL){
936
1164
/* This process exited nicely, so print its buffer */
938
1166
bool bret = print_out_password(proc->buffer,
939
1167
proc->buffer_length);
941
perror("print_out_password");
942
exitstatus = EXIT_FAILURE;
1169
error(0, errno, "print_out_password");
1170
exitstatus = EX_IOERR;
947
1175
/* This process has not completed. Does it have any output? */
948
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1176
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
949
1179
/* This process had nothing to say at this time */
952
1183
/* Before reading, make the process' data buffer large enough */
953
1184
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
954
1185
proc->buffer = realloc(proc->buffer, proc->buffer_size
955
1186
+ (size_t) BUFFER_SIZE);
956
if (proc->buffer == NULL){
958
exitstatus = EXIT_FAILURE;
1187
if(proc->buffer == NULL){
1188
error(0, errno, "malloc");
1189
exitstatus = EX_OSERR;
961
1192
proc->buffer_size += BUFFER_SIZE;
963
1194
/* Read from the process */
964
ret = read(proc->fd, proc->buffer + proc->buffer_length,
1195
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1197
+ proc->buffer_length,
967
1200
/* Read error from this process; ignore the error */
972
1206
proc->eof = true;
974
proc->buffer_length += (size_t) ret;
1208
proc->buffer_length += (size_t) sret;
982
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1216
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1217
and exitstatus != EX_OK)){
983
1218
/* Fallback if all plugins failed, none are found or an error
986
1221
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
987
1222
char *passwordbuffer = getpass("Password: ");
988
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
1223
size_t len = strlen(passwordbuffer);
1224
/* Strip trailing newline */
1225
if(len > 0 and passwordbuffer[len-1] == '\n'){
1226
passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1229
bret = print_out_password(passwordbuffer, len);
990
perror("print_out_password");
991
exitstatus = EXIT_FAILURE;
1231
error(0, errno, "print_out_password");
1232
exitstatus = EX_IOERR;
995
1236
/* Restore old signal handler */
996
1237
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
999
exitstatus = EXIT_FAILURE;
1239
error(0, errno, "sigaction");
1240
exitstatus = EX_OSERR;
1002
1243
if(custom_argv != NULL){
1003
1244
for(char **arg = custom_argv+1; *arg != NULL; arg++){