19
18
* along with this program. If not, see
20
19
* <http://www.gnu.org/licenses/>.
22
* Contact the authors at <mandos@recompile.se>.
21
* Contact the authors at <mandos@fukt.bsnet.se>.
25
24
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf(), O_CLOEXEC */
27
26
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
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(),
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(),
54
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
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
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() */
76
67
#define BUFFER_SIZE 256
78
69
#define PDIR "/lib/mandos/plugins.d"
79
70
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
81
const char *argp_program_version = "plugin-runner " VERSION;
82
const char *argp_program_bug_address = "<mandos@recompile.se>";
72
const char *argp_program_version = "plugin-runner 1.0";
73
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
84
77
typedef struct plugin{
85
78
char *name; /* can be NULL or any plugin name */
106
99
/* Gets an 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){
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))){
116
109
/* Create a new plugin */
117
plugin *new_plugin = NULL;
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){
124
114
char *copy_name = NULL;
125
115
if(name != NULL){
127
copy_name = strdup(name);
128
} while(copy_name == NULL and errno == EINTR);
116
copy_name = strdup(name);
129
117
if(copy_name == NULL){
137
*new_plugin = (plugin){ .name = copy_name,
140
.next = plugin_list };
122
*new_plugin = (plugin) { .name = copy_name,
125
.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){
127
new_plugin->argv = malloc(sizeof(char *) * 2);
128
if (new_plugin->argv == NULL){
148
130
free(new_plugin);
152
133
new_plugin->argv[0] = copy_name;
153
134
new_plugin->argv[1] = NULL;
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){
161
139
free(new_plugin->argv);
162
140
free(new_plugin);
166
143
new_plugin->environ[0] = NULL;
411
373
.doc = "Group ID the plugins will run as", .group = 3 },
412
374
{ .name = "debug", .key = 132,
413
375
.doc = "Debug mode", .group = 4 },
415
* These reproduce what we would get without ARGP_NO_HELP
417
{ .name = "help", .key = '?',
418
.doc = "Give this help list", .group = -1 },
419
{ .name = "usage", .key = -3,
420
.doc = "Give a short usage message", .group = -1 },
421
{ .name = "version", .key = 'V',
422
.doc = "Print program version", .group = -1 },
426
__attribute__((nonnull(3)))
427
error_t parse_opt(int key, char *arg, struct argp_state *state){
379
error_t parse_opt (int key, char *arg, __attribute__((unused))
380
struct argp_state *state) {
432
382
case 'g': /* --global-options */
435
while((plugin_option = strsep(&arg, ",")) != NULL){
436
if(not add_argument(getplugin(NULL), plugin_option)){
385
while((p = strsep(&arg, ",")) != NULL){
389
if(not add_argument(getplugin(NULL), p)){
390
perror("add_argument");
391
return ARGP_ERR_UNKNOWN;
442
396
case 'G': /* --global-env */
443
add_environment(getplugin(NULL), arg, true);
401
char *envdef = strdup(arg);
405
if(not add_environment(getplugin(NULL), envdef, true)){
406
perror("add_environment");
445
410
case 'o': /* --options-for */
447
char *option_list = strchr(arg, ':');
448
if(option_list == NULL){
449
argp_error(state, "No colon in \"%s\"", arg);
456
argp_error(state, "Empty plugin name");
461
while((option = strsep(&option_list, ",")) != NULL){
462
if(not add_argument(getplugin(arg), option)){
412
char *p_name = strsep(&arg, ":");
413
if(p_name[0] == '\0' or arg == NULL){
416
char *opt = strsep(&arg, ":");
417
if(opt[0] == '\0' or opt == NULL){
421
while((p = strsep(&opt, ",")) != NULL){
425
if(not add_argument(getplugin(p_name), p)){
426
perror("add_argument");
427
return ARGP_ERR_UNKNOWN;
468
432
case 'E': /* --env-for */
470
437
char *envdef = strchr(arg, ':');
471
438
if(envdef == NULL){
472
argp_error(state, "No colon in \"%s\"", arg);
441
char *p_name = strndup(arg, (size_t) (envdef-arg));
479
argp_error(state, "Empty plugin name");
446
if(not add_environment(getplugin(p_name), envdef, true)){
447
perror("add_environment");
483
add_environment(getplugin(arg), envdef, true);
486
451
case 'd': /* --disable */
488
453
plugin *p = getplugin(arg);
455
return ARGP_ERR_UNKNOWN;
494
460
case 'e': /* --enable */
496
462
plugin *p = getplugin(arg);
464
return ARGP_ERR_UNKNOWN;
502
469
case 128: /* --plugin-dir */
504
470
plugindir = strdup(arg);
471
if(plugindir == NULL){
506
475
case 129: /* --config-file */
507
476
/* This is already done by parse_opt_config_file() */
509
478
case 130: /* --userid */
510
tmp_id = strtoimax(arg, &tmp, 10);
511
if(errno != 0 or tmp == arg or *tmp != '\0'
512
or tmp_id != (uid_t)tmp_id){
513
argp_error(state, "Bad user ID number: \"%s\", using %"
514
PRIdMAX, arg, (intmax_t)uid);
479
uid = (uid_t)strtol(arg, NULL, 10);
519
481
case 131: /* --groupid */
520
tmp_id = strtoimax(arg, &tmp, 10);
521
if(errno != 0 or tmp == arg or *tmp != '\0'
522
or tmp_id != (gid_t)tmp_id){
523
argp_error(state, "Bad group ID number: \"%s\", using %"
524
PRIdMAX, arg, (intmax_t)gid);
482
gid = (gid_t)strtol(arg, NULL, 10);
529
484
case 132: /* --debug */
533
* These reproduce what we would get without ARGP_NO_HELP
535
case '?': /* --help */
536
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
537
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
538
case -3: /* --usage */
539
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
540
argp_state_help(state, state->out_stream,
541
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
542
case 'V': /* --version */
543
fprintf(state->out_stream, "%s\n", argp_program_version);
547
* When adding more options before this line, remember to also add a
548
* "case" to the "parse_opt_config_file" function below.
550
487
case ARGP_KEY_ARG:
551
/* Cryptsetup always passes an argument, which is an empty
552
string if "none" was specified in /etc/crypttab. So if
553
argument was empty, we ignore it silently. */
488
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
558
493
return ARGP_ERR_UNKNOWN;
560
return errno; /* Set to 0 at start */
563
498
/* This option parser is the same as parse_opt() above, except it
564
499
ignores everything but the --config-file option. */
565
error_t parse_opt_config_file(int key, char *arg,
566
__attribute__((unused))
567
struct argp_state *state){
500
error_t parse_opt_config_file (int key, char *arg,
501
__attribute__((unused))
502
struct argp_state *state) {
570
504
case 'g': /* --global-options */
571
505
case 'G': /* --global-env */
572
506
case 'o': /* --options-for */
660
585
new_arg = strdup(p);
661
586
if(new_arg == NULL){
662
error(0, errno, "strdup");
663
exitstatus = EX_OSERR;
588
exitstatus = EXIT_FAILURE;
668
593
custom_argc += 1;
670
char **new_argv = realloc(custom_argv, sizeof(char *)
673
if(new_argv == NULL){
674
error(0, errno, "realloc");
675
exitstatus = EX_OSERR;
680
custom_argv = new_argv;
594
custom_argv = realloc(custom_argv, sizeof(char *)
595
* ((unsigned int) custom_argc + 1));
596
if(custom_argv == NULL){
598
exitstatus = EXIT_FAILURE;
683
602
custom_argv[custom_argc-1] = new_arg;
684
custom_argv[custom_argc] = NULL;
603
custom_argv[custom_argc] = NULL;
688
ret = fclose(conffp);
689
} while(ret == EOF and errno == EINTR);
691
error(0, errno, "fclose");
692
exitstatus = EX_IOERR;
697
608
/* Check for harmful errors and go to fallback. Other errors might
698
609
not affect opening plugins */
699
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
700
error(0, errno, "fopen");
701
exitstatus = EX_OSERR;
610
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
612
exitstatus = EXIT_FAILURE;
705
/* If there were any arguments from the configuration file, pass
706
them to parser as command line arguments */
616
/* If there was any arguments from configuration file,
617
pass them to parser as command arguments */
707
618
if(custom_argv != NULL){
708
ret = argp_parse(&argp, custom_argc, custom_argv,
709
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
717
error(0, errno, "argp_parse");
718
exitstatus = EX_OSERR;
721
exitstatus = EX_CONFIG;
619
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
621
if (ret == ARGP_ERR_UNKNOWN){
622
fprintf(stderr, "Unknown error while parsing arguments\n");
623
exitstatus = EXIT_FAILURE;
726
628
/* Parse actual command line arguments, to let them override the
728
ret = argp_parse(&argp, argc, argv,
729
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
737
error(0, errno, "argp_parse");
738
exitstatus = EX_OSERR;
741
exitstatus = EX_USAGE;
630
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
631
if (ret == ARGP_ERR_UNKNOWN){
632
fprintf(stderr, "Unknown error while parsing arguments\n");
633
exitstatus = EXIT_FAILURE;
749
641
for(char **a = p->argv; *a != NULL; a++){
750
642
fprintf(stderr, "\tArg: %s\n", *a);
752
fprintf(stderr, "...and %d environment variables\n", p->envc);
644
fprintf(stderr, "...and %u environment variables\n", p->envc);
753
645
for(char **a = p->environ; *a != NULL; a++){
754
646
fprintf(stderr, "\t%s\n", *a);
760
/* Work around Debian bug #633582:
761
<http://bugs.debian.org/633582> */
762
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
763
if(plugindir_fd == -1){
764
error(0, errno, "open");
766
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
768
error(0, errno, "fstat");
770
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
771
ret = fchown(plugindir_fd, uid, gid);
773
error(0, errno, "fchown");
777
TEMP_FAILURE_RETRY(close(plugindir_fd));
781
/* Lower permissions */
784
error(0, errno, "setgid");
651
/* Strip permissions down to nobody */
786
652
ret = setuid(uid);
788
error(0, errno, "setuid");
791
/* Open plugin directory with close_on_exec flag */
661
if (plugindir == NULL){
664
dir = opendir(plugindir);
668
perror("Could not open plugin dir");
669
exitstatus = EXIT_FAILURE;
673
/* Set the FD_CLOEXEC flag on the directory, if possible */
794
if(plugindir == NULL){
795
dir_fd = open(PDIR, O_RDONLY |
798
#else /* not O_CLOEXEC */
800
#endif /* not O_CLOEXEC */
803
dir_fd = open(plugindir, O_RDONLY |
806
#else /* not O_CLOEXEC */
808
#endif /* not O_CLOEXEC */
812
error(0, errno, "Could not open plugin dir");
813
exitstatus = EX_UNAVAILABLE;
818
/* Set the FD_CLOEXEC flag on the directory */
819
ret = set_cloexec_flag(dir_fd);
821
error(0, errno, "set_cloexec_flag");
822
TEMP_FAILURE_RETRY(close(dir_fd));
823
exitstatus = EX_OSERR;
826
#endif /* O_CLOEXEC */
828
dir = fdopendir(dir_fd);
830
error(0, errno, "Could not open plugin dir");
831
TEMP_FAILURE_RETRY(close(dir_fd));
832
exitstatus = EX_OSERR;
675
int dir_fd = dirfd(dir);
677
ret = set_cloexec_flag(dir_fd);
679
perror("set_cloexec_flag");
680
exitstatus = EXIT_FAILURE;
983
805
if(p->environ[0] != NULL){
984
806
for(char **e = environ; *e != NULL; e++){
985
807
if(not add_environment(p, *e, false)){
986
error(0, errno, "add_environment");
808
perror("add_environment");
992
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
994
error(0, errno, "pipe");
995
exitstatus = EX_OSERR;
817
exitstatus = EXIT_FAILURE;
998
820
/* Ask OS to automatic close the pipe on exec */
999
821
ret = set_cloexec_flag(pipefd[0]);
1001
error(0, errno, "set_cloexec_flag");
1002
exitstatus = EX_OSERR;
823
perror("set_cloexec_flag");
824
exitstatus = EXIT_FAILURE;
1005
827
ret = set_cloexec_flag(pipefd[1]);
1007
error(0, errno, "set_cloexec_flag");
1008
exitstatus = EX_OSERR;
829
perror("set_cloexec_flag");
830
exitstatus = EXIT_FAILURE;
1011
833
/* Block SIGCHLD until process is safely in process list */
1012
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1013
&sigchld_action.sa_mask,
834
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1016
error(0, errno, "sigprocmask");
1017
exitstatus = EX_OSERR;
836
perror("sigprocmask");
837
exitstatus = EXIT_FAILURE;
1020
840
/* Starting a new process to be watched */
1024
} while(pid == -1 and errno == EINTR);
1026
error(0, errno, "fork");
1027
exitstatus = EX_OSERR;
844
exitstatus = EXIT_FAILURE;
1031
848
/* this is the child process */
1032
849
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1034
error(0, errno, "sigaction");
1037
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
854
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1039
error(0, errno, "sigprocmask");
856
perror("sigprocmask");
1043
860
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1045
error(0, errno, "dup2");
1049
866
if(dirfd(dir) < 0){
1129
928
free_plugin_list();
1133
932
/* Main loop while running plugins exist */
1134
933
while(plugin_list){
1135
934
fd_set rfds = rfds_all;
1136
935
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1137
if(select_ret == -1 and errno != EINTR){
1138
error(0, errno, "select");
1139
exitstatus = EX_OSERR;
936
if (select_ret == -1){
938
exitstatus = EXIT_FAILURE;
1142
941
/* OK, now either a process completed, or something can be read
1143
942
from one of them */
1144
for(plugin *proc = plugin_list; proc != NULL;){
943
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
1145
944
/* Is this process completely done? */
1146
if(proc->completed and proc->eof){
945
if(proc->eof and proc->completed){
1147
946
/* Only accept the plugin output if it exited cleanly */
1148
947
if(not WIFEXITED(proc->status)
1149
948
or WEXITSTATUS(proc->status) != 0){
1150
949
/* Bad exit by plugin */
1153
952
if(WIFEXITED(proc->status)){
1154
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1155
" status %d\n", proc->name,
1156
(intmax_t) (proc->pid),
953
fprintf(stderr, "Plugin %u exited with status %d\n",
954
(unsigned int) (proc->pid),
1157
955
WEXITSTATUS(proc->status));
1158
} else if(WIFSIGNALED(proc->status)){
1159
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1160
" signal %d: %s\n", proc->name,
1161
(intmax_t) (proc->pid),
1162
WTERMSIG(proc->status),
1163
strsignal(WTERMSIG(proc->status)));
956
} else if(WIFSIGNALED(proc->status)) {
957
fprintf(stderr, "Plugin %u killed by signal %d\n",
958
(unsigned int) (proc->pid),
959
WTERMSIG(proc->status));
1164
960
} else if(WCOREDUMP(proc->status)){
1165
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1166
" core\n", proc->name, (intmax_t) (proc->pid));
961
fprintf(stderr, "Plugin %d dumped core\n",
962
(unsigned int) (proc->pid));
1170
966
/* Remove the plugin */
1171
#if defined (__GNUC__) and defined (__GLIBC__)
1172
#if not __GLIBC_PREREQ(2, 16)
1173
#pragma GCC diagnostic push
1174
#pragma GCC diagnostic ignored "-Wsign-conversion"
1177
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1178
-Wconversion in GNU libc
1180
#if defined (__GNUC__) and defined (__GLIBC__)
1181
#if not __GLIBC_PREREQ(2, 16)
1182
#pragma GCC diagnostic pop
967
FD_CLR(proc->fd, &rfds_all);
1186
969
/* Block signal while modifying process_list */
1187
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1189
&sigchld_action.sa_mask,
970
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1192
error(0, errno, "sigprocmask");
1193
exitstatus = EX_OSERR;
972
perror("sigprocmask");
973
exitstatus = EXIT_FAILURE;
1197
plugin *next_plugin = proc->next;
1198
976
free_plugin(proc);
1201
977
/* We are done modifying process list, so unblock signal */
1202
ret = (int)(TEMP_FAILURE_RETRY
1203
(sigprocmask(SIG_UNBLOCK,
1204
&sigchld_action.sa_mask, NULL)));
978
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
1206
error(0, errno, "sigprocmask");
1207
exitstatus = EX_OSERR;
981
perror("sigprocmask");
982
exitstatus = EXIT_FAILURE;
1211
986
if(plugin_list == NULL){
1218
992
/* This process exited nicely, so print its buffer */
1220
994
bool bret = print_out_password(proc->buffer,
1221
995
proc->buffer_length);
1223
error(0, errno, "print_out_password");
1224
exitstatus = EX_IOERR;
997
perror("print_out_password");
998
exitstatus = EXIT_FAILURE;
1229
1003
/* This process has not completed. Does it have any output? */
1230
#if defined (__GNUC__) and defined (__GLIBC__)
1231
#if not __GLIBC_PREREQ(2, 16)
1232
#pragma GCC diagnostic push
1233
#pragma GCC diagnostic ignored "-Wsign-conversion"
1236
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1242
#if defined (__GNUC__) and defined (__GLIBC__)
1243
#if not __GLIBC_PREREQ(2, 16)
1244
#pragma GCC diagnostic pop
1004
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1247
1005
/* This process had nothing to say at this time */
1251
1008
/* Before reading, make the process' data buffer large enough */
1252
1009
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1253
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1254
+ (size_t) BUFFER_SIZE);
1255
if(new_buffer == NULL){
1256
error(0, errno, "malloc");
1257
exitstatus = EX_OSERR;
1010
proc->buffer = realloc(proc->buffer, proc->buffer_size
1011
+ (size_t) BUFFER_SIZE);
1012
if (proc->buffer == NULL){
1014
exitstatus = EXIT_FAILURE;
1260
proc->buffer = new_buffer;
1261
1017
proc->buffer_size += BUFFER_SIZE;
1263
1019
/* Read from the process */
1264
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1266
+ proc->buffer_length,
1020
ret = read(proc->fd, proc->buffer + proc->buffer_length,
1269
1023
/* Read error from this process; ignore the error */
1275
1028
proc->eof = true;
1277
proc->buffer_length += (size_t) sret;
1030
proc->buffer_length += (size_t) ret;
1285
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1286
and exitstatus != EX_OK)){
1038
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1287
1039
/* Fallback if all plugins failed, none are found or an error
1290
1042
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
1291
1043
char *passwordbuffer = getpass("Password: ");
1292
size_t len = strlen(passwordbuffer);
1293
/* Strip trailing newline */
1294
if(len > 0 and passwordbuffer[len-1] == '\n'){
1295
passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1298
bret = print_out_password(passwordbuffer, len);
1044
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
1300
error(0, errno, "print_out_password");
1301
exitstatus = EX_IOERR;
1046
perror("print_out_password");
1047
exitstatus = EXIT_FAILURE;
1305
1051
/* Restore old signal handler */
1306
1052
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1308
error(0, errno, "sigaction");
1309
exitstatus = EX_OSERR;
1054
perror("sigaction");
1055
exitstatus = EXIT_FAILURE;
1312
1058
if(custom_argv != NULL){
1313
1059
for(char **arg = custom_argv+1; *arg != NULL; arg++){