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(),
52
execve(), write(), read(),
49
dup2, STDOUT_FILENO, _exit(),
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 */
96
89
size_t buffer_size;
97
90
size_t buffer_length;
99
volatile sig_atomic_t completed;
92
volatile bool completed;
101
94
struct plugin *next;
104
97
static plugin *plugin_list = NULL;
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
__attribute__((warn_unused_result))
109
101
static plugin *getplugin(char *name){
110
/* Check for existing plugin with that name */
111
for(plugin *p = plugin_list; p != NULL; p = p->next){
113
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))){
117
109
/* Create a new plugin */
118
plugin *new_plugin = NULL;
120
new_plugin = malloc(sizeof(plugin));
121
} while(new_plugin == NULL and errno == EINTR);
122
if(new_plugin == NULL){
110
plugin *new_plugin = malloc(sizeof(plugin));
111
if (new_plugin == NULL){
125
114
char *copy_name = NULL;
126
115
if(name != NULL){
128
copy_name = strdup(name);
129
} while(copy_name == NULL and errno == EINTR);
116
copy_name = strdup(name);
130
117
if(copy_name == NULL){
138
*new_plugin = (plugin){ .name = copy_name,
141
.next = plugin_list };
144
new_plugin->argv = malloc(sizeof(char *) * 2);
145
} while(new_plugin->argv == NULL and errno == EINTR);
146
if(new_plugin->argv == 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){
149
130
free(new_plugin);
153
133
new_plugin->argv[0] = copy_name;
154
134
new_plugin->argv[1] = NULL;
157
new_plugin->environ = malloc(sizeof(char *));
158
} while(new_plugin->environ == NULL and errno == EINTR);
136
new_plugin->environ = malloc(sizeof(char *));
159
137
if(new_plugin->environ == NULL){
162
139
free(new_plugin->argv);
163
140
free(new_plugin);
167
143
new_plugin->environ[0] = NULL;
413
373
.doc = "Group ID the plugins will run as", .group = 3 },
414
374
{ .name = "debug", .key = 132,
415
375
.doc = "Debug mode", .group = 4 },
417
* These reproduce what we would get without ARGP_NO_HELP
419
{ .name = "help", .key = '?',
420
.doc = "Give this help list", .group = -1 },
421
{ .name = "usage", .key = -3,
422
.doc = "Give a short usage message", .group = -1 },
423
{ .name = "version", .key = 'V',
424
.doc = "Print program version", .group = -1 },
428
__attribute__((nonnull(3)))
429
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) {
434
382
case 'g': /* --global-options */
437
while((plugin_option = strsep(&arg, ",")) != NULL){
438
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;
445
396
case 'G': /* --global-env */
446
if(add_environment(getplugin(NULL), arg, true)){
401
char *envdef = strdup(arg);
405
if(not add_environment(getplugin(NULL), envdef, true)){
406
perror("add_environment");
450
410
case 'o': /* --options-for */
452
char *option_list = strchr(arg, ':');
453
if(option_list == NULL){
454
argp_error(state, "No colon in \"%s\"", arg);
461
argp_error(state, "Empty plugin name");
466
while((option = strsep(&option_list, ",")) != NULL){
467
if(not add_argument(getplugin(arg), option)){
412
char *p_name = strsep(&arg, ":");
413
if(p_name[0] == '\0'){
416
char *opt = strsep(&arg, ":");
422
while((p = strsep(&opt, ",")) != NULL){
426
if(not add_argument(getplugin(p_name), p)){
427
perror("add_argument");
428
return ARGP_ERR_UNKNOWN;
474
434
case 'E': /* --env-for */
476
439
char *envdef = strchr(arg, ':');
477
440
if(envdef == NULL){
478
argp_error(state, "No colon in \"%s\"", arg);
443
char *p_name = strndup(arg, (size_t) (envdef-arg));
485
argp_error(state, "Empty plugin name");
489
if(add_environment(getplugin(arg), envdef, true)){
448
if(not add_environment(getplugin(p_name), envdef, true)){
449
perror("add_environment");
494
453
case 'd': /* --disable */
496
455
plugin *p = getplugin(arg);
457
return ARGP_ERR_UNKNOWN;
503
462
case 'e': /* --enable */
505
464
plugin *p = getplugin(arg);
466
return ARGP_ERR_UNKNOWN;
512
471
case 128: /* --plugin-dir */
514
472
plugindir = strdup(arg);
515
if(plugindir != NULL){
473
if(plugindir == NULL){
519
477
case 129: /* --config-file */
520
478
/* This is already done by parse_opt_config_file() */
522
480
case 130: /* --userid */
523
tmp_id = strtoimax(arg, &tmp, 10);
524
if(errno != 0 or tmp == arg or *tmp != '\0'
525
or tmp_id != (uid_t)tmp_id){
526
argp_error(state, "Bad user ID number: \"%s\", using %"
527
PRIdMAX, arg, (intmax_t)uid);
481
uid = (uid_t)strtol(arg, NULL, 10);
533
483
case 131: /* --groupid */
534
tmp_id = strtoimax(arg, &tmp, 10);
535
if(errno != 0 or tmp == arg or *tmp != '\0'
536
or tmp_id != (gid_t)tmp_id){
537
argp_error(state, "Bad group ID number: \"%s\", using %"
538
PRIdMAX, arg, (intmax_t)gid);
484
gid = (gid_t)strtol(arg, NULL, 10);
544
486
case 132: /* --debug */
548
* These reproduce what we would get without ARGP_NO_HELP
550
case '?': /* --help */
551
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
552
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
553
case -3: /* --usage */
554
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
555
argp_state_help(state, state->out_stream,
556
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
557
case 'V': /* --version */
558
fprintf(state->out_stream, "%s\n", argp_program_version);
562
* When adding more options before this line, remember to also add a
563
* "case" to the "parse_opt_config_file" function below.
565
489
case ARGP_KEY_ARG:
566
/* Cryptsetup always passes an argument, which is an empty
567
string if "none" was specified in /etc/crypttab. So if
568
argument was empty, we ignore it silently. */
490
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
573
495
return ARGP_ERR_UNKNOWN;
575
return errno; /* Set to 0 at start */
578
500
/* This option parser is the same as parse_opt() above, except it
579
501
ignores everything but the --config-file option. */
580
error_t parse_opt_config_file(int key, char *arg,
581
__attribute__((unused))
582
struct argp_state *state){
502
error_t parse_opt_config_file (int key, char *arg,
503
__attribute__((unused))
504
struct argp_state *state) {
585
506
case 'g': /* --global-options */
586
507
case 'G': /* --global-env */
587
508
case 'o': /* --options-for */
678
587
new_arg = strdup(p);
679
588
if(new_arg == NULL){
680
error(0, errno, "strdup");
681
exitstatus = EX_OSERR;
590
exitstatus = EXIT_FAILURE;
686
595
custom_argc += 1;
688
char **new_argv = realloc(custom_argv, sizeof(char *)
691
if(new_argv == NULL){
692
error(0, errno, "realloc");
693
exitstatus = EX_OSERR;
698
custom_argv = new_argv;
596
custom_argv = realloc(custom_argv, sizeof(char *)
597
* ((unsigned int) custom_argc + 1));
598
if(custom_argv == NULL){
600
exitstatus = EXIT_FAILURE;
701
604
custom_argv[custom_argc-1] = new_arg;
702
custom_argv[custom_argc] = NULL;
605
custom_argv[custom_argc] = NULL;
706
ret = fclose(conffp);
707
} while(ret == EOF and errno == EINTR);
709
error(0, errno, "fclose");
710
exitstatus = EX_IOERR;
715
610
/* Check for harmful errors and go to fallback. Other errors might
716
611
not affect opening plugins */
717
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
718
error(0, errno, "fopen");
719
exitstatus = EX_OSERR;
612
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
614
exitstatus = EXIT_FAILURE;
723
/* If there were any arguments from the configuration file, pass
724
them to parser as command line arguments */
618
/* If there was any arguments from configuration file,
619
pass them to parser as command arguments */
725
620
if(custom_argv != NULL){
726
ret = argp_parse(&argp, custom_argc, custom_argv,
727
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
735
error(0, errno, "argp_parse");
736
exitstatus = EX_OSERR;
739
exitstatus = EX_CONFIG;
621
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
623
if (ret == ARGP_ERR_UNKNOWN){
624
fprintf(stderr, "Unknown error while parsing arguments\n");
625
exitstatus = EXIT_FAILURE;
744
630
/* Parse actual command line arguments, to let them override the
746
ret = argp_parse(&argp, argc, argv,
747
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
755
error(0, errno, "argp_parse");
756
exitstatus = EX_OSERR;
759
exitstatus = EX_USAGE;
632
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
633
if (ret == ARGP_ERR_UNKNOWN){
634
fprintf(stderr, "Unknown error while parsing arguments\n");
635
exitstatus = EXIT_FAILURE;
767
643
for(char **a = p->argv; *a != NULL; a++){
768
644
fprintf(stderr, "\tArg: %s\n", *a);
770
fprintf(stderr, "...and %d environment variables\n", p->envc);
646
fprintf(stderr, "...and %u environment variables\n", p->envc);
771
647
for(char **a = p->environ; *a != NULL; a++){
772
648
fprintf(stderr, "\t%s\n", *a);
778
/* Work around Debian bug #633582:
779
<http://bugs.debian.org/633582> */
780
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
781
if(plugindir_fd == -1){
782
error(0, errno, "open(\"" PDIR "\")");
784
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
786
error(0, errno, "fstat");
788
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
789
ret = fchown(plugindir_fd, uid, gid);
791
error(0, errno, "fchown");
795
TEMP_FAILURE_RETRY(close(plugindir_fd));
799
/* Lower permissions */
802
error(0, errno, "setgid");
653
/* Strip permissions down to nobody */
804
654
ret = setuid(uid);
806
error(0, errno, "setuid");
809
/* Open plugin directory with close_on_exec flag */
663
if (plugindir == NULL){
666
dir = opendir(plugindir);
670
perror("Could not open plugin dir");
671
exitstatus = EXIT_FAILURE;
675
/* Set the FD_CLOEXEC flag on the directory, if possible */
812
if(plugindir == NULL){
813
dir_fd = open(PDIR, O_RDONLY |
816
#else /* not O_CLOEXEC */
818
#endif /* not O_CLOEXEC */
821
dir_fd = open(plugindir, O_RDONLY |
824
#else /* not O_CLOEXEC */
826
#endif /* not O_CLOEXEC */
830
error(0, errno, "Could not open plugin dir");
831
exitstatus = EX_UNAVAILABLE;
836
/* Set the FD_CLOEXEC flag on the directory */
837
ret = set_cloexec_flag(dir_fd);
839
error(0, errno, "set_cloexec_flag");
840
TEMP_FAILURE_RETRY(close(dir_fd));
841
exitstatus = EX_OSERR;
844
#endif /* O_CLOEXEC */
846
dir = fdopendir(dir_fd);
848
error(0, errno, "Could not open plugin dir");
849
TEMP_FAILURE_RETRY(close(dir_fd));
850
exitstatus = EX_OSERR;
677
int dir_fd = dirfd(dir);
679
ret = set_cloexec_flag(dir_fd);
681
perror("set_cloexec_flag");
682
exitstatus = EXIT_FAILURE;
1001
807
if(p->environ[0] != NULL){
1002
808
for(char **e = environ; *e != NULL; e++){
1003
809
if(not add_environment(p, *e, false)){
1004
error(0, errno, "add_environment");
810
perror("add_environment");
1010
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
1012
error(0, errno, "pipe");
1013
exitstatus = EX_OSERR;
819
exitstatus = EXIT_FAILURE;
1016
822
/* Ask OS to automatic close the pipe on exec */
1017
823
ret = set_cloexec_flag(pipefd[0]);
1019
error(0, errno, "set_cloexec_flag");
1020
exitstatus = EX_OSERR;
825
perror("set_cloexec_flag");
826
exitstatus = EXIT_FAILURE;
1023
829
ret = set_cloexec_flag(pipefd[1]);
1025
error(0, errno, "set_cloexec_flag");
1026
exitstatus = EX_OSERR;
831
perror("set_cloexec_flag");
832
exitstatus = EXIT_FAILURE;
1029
835
/* Block SIGCHLD until process is safely in process list */
1030
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1031
&sigchld_action.sa_mask,
836
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1034
error(0, errno, "sigprocmask");
1035
exitstatus = EX_OSERR;
838
perror("sigprocmask");
839
exitstatus = EXIT_FAILURE;
1038
842
/* Starting a new process to be watched */
1042
} while(pid == -1 and errno == EINTR);
1044
error(0, errno, "fork");
1045
exitstatus = EX_OSERR;
846
exitstatus = EXIT_FAILURE;
1049
850
/* this is the child process */
1050
851
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1052
error(0, errno, "sigaction");
1055
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
856
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1057
error(0, errno, "sigprocmask");
858
perror("sigprocmask");
1061
862
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1063
error(0, errno, "dup2");
1067
868
if(dirfd(dir) < 0){
1141
930
free_plugin_list();
1145
934
/* Main loop while running plugins exist */
1146
935
while(plugin_list){
1147
936
fd_set rfds = rfds_all;
1148
937
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1149
if(select_ret == -1 and errno != EINTR){
1150
error(0, errno, "select");
1151
exitstatus = EX_OSERR;
938
if (select_ret == -1){
940
exitstatus = EXIT_FAILURE;
1154
943
/* OK, now either a process completed, or something can be read
1155
944
from one of them */
1156
for(plugin *proc = plugin_list; proc != NULL;){
945
for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
1157
946
/* Is this process completely done? */
1158
if(proc->completed and proc->eof){
947
if(proc->eof and proc->completed){
1159
948
/* Only accept the plugin output if it exited cleanly */
1160
949
if(not WIFEXITED(proc->status)
1161
950
or WEXITSTATUS(proc->status) != 0){
1162
951
/* Bad exit by plugin */
1165
954
if(WIFEXITED(proc->status)){
1166
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1167
" status %d\n", proc->name,
1168
(intmax_t) (proc->pid),
955
fprintf(stderr, "Plugin %u exited with status %d\n",
956
(unsigned int) (proc->pid),
1169
957
WEXITSTATUS(proc->status));
1170
} else if(WIFSIGNALED(proc->status)){
1171
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1172
" signal %d: %s\n", proc->name,
1173
(intmax_t) (proc->pid),
1174
WTERMSIG(proc->status),
1175
strsignal(WTERMSIG(proc->status)));
958
} else if(WIFSIGNALED(proc->status)) {
959
fprintf(stderr, "Plugin %u killed by signal %d\n",
960
(unsigned int) (proc->pid),
961
WTERMSIG(proc->status));
1176
962
} else if(WCOREDUMP(proc->status)){
1177
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1178
" core\n", proc->name, (intmax_t) (proc->pid));
963
fprintf(stderr, "Plugin %d dumped core\n",
964
(unsigned int) (proc->pid));
1182
968
/* Remove the plugin */
1183
#if defined (__GNUC__) and defined (__GLIBC__)
1184
#if not __GLIBC_PREREQ(2, 16)
1185
#pragma GCC diagnostic push
1186
#pragma GCC diagnostic ignored "-Wsign-conversion"
1189
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1190
-Wconversion in GNU libc
1192
#if defined (__GNUC__) and defined (__GLIBC__)
1193
#if not __GLIBC_PREREQ(2, 16)
1194
#pragma GCC diagnostic pop
969
FD_CLR(proc->fd, &rfds_all);
1198
971
/* Block signal while modifying process_list */
1199
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1201
&sigchld_action.sa_mask,
972
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1204
error(0, errno, "sigprocmask");
1205
exitstatus = EX_OSERR;
974
perror("sigprocmask");
975
exitstatus = EXIT_FAILURE;
1209
plugin *next_plugin = proc->next;
1210
978
free_plugin(proc);
1213
979
/* We are done modifying process list, so unblock signal */
1214
ret = (int)(TEMP_FAILURE_RETRY
1215
(sigprocmask(SIG_UNBLOCK,
1216
&sigchld_action.sa_mask, NULL)));
980
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
1218
error(0, errno, "sigprocmask");
1219
exitstatus = EX_OSERR;
983
perror("sigprocmask");
984
exitstatus = EXIT_FAILURE;
1223
988
if(plugin_list == NULL){
1230
994
/* This process exited nicely, so print its buffer */
1232
996
bool bret = print_out_password(proc->buffer,
1233
997
proc->buffer_length);
1235
error(0, errno, "print_out_password");
1236
exitstatus = EX_IOERR;
999
perror("print_out_password");
1000
exitstatus = EXIT_FAILURE;
1241
1005
/* This process has not completed. Does it have any output? */
1242
#if defined (__GNUC__) and defined (__GLIBC__)
1243
#if not __GLIBC_PREREQ(2, 16)
1244
#pragma GCC diagnostic push
1245
#pragma GCC diagnostic ignored "-Wsign-conversion"
1248
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1254
#if defined (__GNUC__) and defined (__GLIBC__)
1255
#if not __GLIBC_PREREQ(2, 16)
1256
#pragma GCC diagnostic pop
1006
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1259
1007
/* This process had nothing to say at this time */
1263
1010
/* Before reading, make the process' data buffer large enough */
1264
1011
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1265
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1266
+ (size_t) BUFFER_SIZE);
1267
if(new_buffer == NULL){
1268
error(0, errno, "malloc");
1269
exitstatus = EX_OSERR;
1012
proc->buffer = realloc(proc->buffer, proc->buffer_size
1013
+ (size_t) BUFFER_SIZE);
1014
if (proc->buffer == NULL){
1016
exitstatus = EXIT_FAILURE;
1272
proc->buffer = new_buffer;
1273
1019
proc->buffer_size += BUFFER_SIZE;
1275
1021
/* Read from the process */
1276
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1278
+ proc->buffer_length,
1022
ret = read(proc->fd, proc->buffer + proc->buffer_length,
1281
1025
/* Read error from this process; ignore the error */
1287
1030
proc->eof = true;
1289
proc->buffer_length += (size_t) sret;
1032
proc->buffer_length += (size_t) ret;
1297
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1298
and exitstatus != EX_OK)){
1040
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1299
1041
/* Fallback if all plugins failed, none are found or an error
1302
1044
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
1303
1045
char *passwordbuffer = getpass("Password: ");
1304
size_t len = strlen(passwordbuffer);
1305
/* Strip trailing newline */
1306
if(len > 0 and passwordbuffer[len-1] == '\n'){
1307
passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1310
bret = print_out_password(passwordbuffer, len);
1046
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
1312
error(0, errno, "print_out_password");
1313
exitstatus = EX_IOERR;
1048
perror("print_out_password");
1049
exitstatus = EXIT_FAILURE;
1317
1053
/* Restore old signal handler */
1318
1054
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1320
error(0, errno, "sigaction");
1321
exitstatus = EX_OSERR;
1056
perror("sigaction");
1057
exitstatus = EXIT_FAILURE;
1324
1060
if(custom_argv != NULL){
1325
1061
for(char **arg = custom_argv+1; *arg != NULL; arg++){