19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
22
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.se>.
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
27
27
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
30
30
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
34
stat, waitpid(), WIFEXITED(),
35
WEXITSTATUS(), wait(), pid_t,
36
uid_t, gid_t, getuid(), getgid(),
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO, fclose() */
33
#include <sys/types.h> /* fstat(), struct stat, waitpid(),
34
WIFEXITED(), WEXITSTATUS(), wait(),
35
pid_t, uid_t, gid_t, getuid(),
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(),
42
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
40
WEXITSTATUS(), WTERMSIG(),
42
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
43
43
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
readdir(), closedir(), dirfd() */
46
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
fcntl(), setuid(), setgid(),
48
F_GETFD, F_SETFD, FD_CLOEXEC,
49
access(), pipe(), fork(), close()
50
dup2(), STDOUT_FILENO, _exit(),
51
execv(), write(), read(),
44
#include <dirent.h> /* struct dirent, scandirat() */
45
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
46
FD_CLOEXEC, write(), STDOUT_FILENO,
47
struct stat, fstat(), close(),
48
setgid(), setuid(), S_ISREG(),
49
faccessat() pipe2(), fork(),
50
_exit(), dup2(), fexecve(), read()
53
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
#include <string.h> /* strsep, strlen(), asprintf() */
53
FD_CLOEXEC, openat(), scandirat(),
55
#include <string.h> /* strsep, strlen(), strsignal(),
56
strcmp(), strncmp() */
56
57
#include <errno.h> /* errno */
57
58
#include <argp.h> /* struct argp_option, struct
58
59
argp_state, struct argp,
62
63
#include <signal.h> /* struct sigaction, sigemptyset(),
63
64
sigaddset(), sigaction(),
64
65
sigprocmask(), SIG_BLOCK, SIGCHLD,
65
SIG_UNBLOCK, kill() */
66
SIG_UNBLOCK, kill(), sig_atomic_t
66
68
#include <errno.h> /* errno, EBADF */
67
#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */
69
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
70
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
71
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
72
#include <errno.h> /* errno */
73
#include <error.h> /* error() */
74
#include <fnmatch.h> /* fnmatch() */
69
76
#define BUFFER_SIZE 256
71
78
#define PDIR "/lib/mandos/plugins.d"
79
#define PHDIR "/lib/mandos/plugin-helpers"
72
80
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
74
82
const char *argp_program_version = "plugin-runner " VERSION;
75
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
83
const char *argp_program_bug_address = "<mandos@recompile.se>";
77
85
typedef struct plugin{
78
86
char *name; /* can be NULL or any plugin name */
374
416
.doc = "Group ID the plugins will run as", .group = 3 },
375
417
{ .name = "debug", .key = 132,
376
418
.doc = "Debug mode", .group = 4 },
419
{ .name = "plugin-helper-dir", .key = 133,
421
.doc = "Specify a different plugin helper directory",
424
* These reproduce what we would get without ARGP_NO_HELP
426
{ .name = "help", .key = '?',
427
.doc = "Give this help list", .group = -1 },
428
{ .name = "usage", .key = -3,
429
.doc = "Give a short usage message", .group = -1 },
430
{ .name = "version", .key = 'V',
431
.doc = "Print program version", .group = -1 },
380
error_t parse_opt(int key, char *arg, __attribute__((unused))
381
struct argp_state *state){
435
__attribute__((nonnull(3)))
436
error_t parse_opt(int key, char *arg, struct argp_state *state){
383
441
case 'g': /* --global-options */
386
while((p = strsep(&arg, ",")) != NULL){
390
if(not add_argument(getplugin(NULL), p)){
391
perror("add_argument");
392
return ARGP_ERR_UNKNOWN;
444
while((plugin_option = strsep(&arg, ",")) != NULL){
445
if(not add_argument(getplugin(NULL), plugin_option)){
397
452
case 'G': /* --global-env */
401
if(not add_environment(getplugin(NULL), arg, true)){
402
perror("add_environment");
453
if(add_environment(getplugin(NULL), arg, true)){
405
457
case 'o': /* --options-for */
407
char *p_name = strsep(&arg, ":");
408
if(p_name[0] == '\0' or arg == NULL){
411
char *opt = strsep(&arg, ":");
412
if(opt[0] == '\0' or opt == NULL){
416
while((p = strsep(&opt, ",")) != NULL){
420
if(not add_argument(getplugin(p_name), p)){
421
perror("add_argument");
422
return ARGP_ERR_UNKNOWN;
459
char *option_list = strchr(arg, ':');
460
if(option_list == NULL){
461
argp_error(state, "No colon in \"%s\"", arg);
468
argp_error(state, "Empty plugin name");
473
while((option = strsep(&option_list, ",")) != NULL){
474
if(not add_argument(getplugin(arg), option)){
427
481
case 'E': /* --env-for */
432
483
char *envdef = strchr(arg, ':');
433
484
if(envdef == NULL){
485
argp_error(state, "No colon in \"%s\"", arg);
437
if(not add_environment(getplugin(arg), envdef+1, true)){
438
perror("add_environment");
492
argp_error(state, "Empty plugin name");
496
if(add_environment(getplugin(arg), envdef, true)){
442
501
case 'd': /* --disable */
444
503
plugin *p = getplugin(arg);
446
return ARGP_ERR_UNKNOWN;
451
510
case 'e': /* --enable */
453
512
plugin *p = getplugin(arg);
455
return ARGP_ERR_UNKNOWN;
460
519
case 128: /* --plugin-dir */
462
521
plugindir = strdup(arg);
463
if(plugindir == NULL){
522
if(plugindir != NULL){
467
526
case 129: /* --config-file */
468
527
/* This is already done by parse_opt_config_file() */
470
529
case 130: /* --userid */
471
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
472
if(ret < 1 or tmpmax != (uid_t)tmpmax
473
or arg[numchars] != '\0'){
474
fprintf(stderr, "Bad user ID number: \"%s\", using %"
475
PRIdMAX "\n", arg, (intmax_t)uid);
530
tmp_id = strtoimax(arg, &tmp, 10);
531
if(errno != 0 or tmp == arg or *tmp != '\0'
532
or tmp_id != (uid_t)tmp_id){
533
argp_error(state, "Bad user ID number: \"%s\", using %"
534
PRIdMAX, arg, (intmax_t)uid);
480
540
case 131: /* --groupid */
481
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
482
if(ret < 1 or tmpmax != (gid_t)tmpmax
483
or arg[numchars] != '\0'){
484
fprintf(stderr, "Bad group ID number: \"%s\", using %"
485
PRIdMAX "\n", arg, (intmax_t)gid);
541
tmp_id = strtoimax(arg, &tmp, 10);
542
if(errno != 0 or tmp == arg or *tmp != '\0'
543
or tmp_id != (gid_t)tmp_id){
544
argp_error(state, "Bad group ID number: \"%s\", using %"
545
PRIdMAX, arg, (intmax_t)gid);
490
551
case 132: /* --debug */
554
case 133: /* --plugin-helper-dir */
555
free(pluginhelperdir);
556
pluginhelperdir = strdup(arg);
557
if(pluginhelperdir != NULL){
562
* These reproduce what we would get without ARGP_NO_HELP
564
case '?': /* --help */
565
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
566
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
567
case -3: /* --usage */
568
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
569
argp_state_help(state, state->out_stream,
570
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
571
case 'V': /* --version */
572
fprintf(state->out_stream, "%s\n", argp_program_version);
494
576
* When adding more options before this line, remember to also add a
495
577
* "case" to the "parse_opt_config_file" function below.
600
693
new_arg = strdup(p);
601
694
if(new_arg == NULL){
603
exitstatus = EXIT_FAILURE;
695
error(0, errno, "strdup");
696
exitstatus = EX_OSERR;
608
701
custom_argc += 1;
609
custom_argv = realloc(custom_argv, sizeof(char *)
610
* ((unsigned int) custom_argc + 1));
611
if(custom_argv == NULL){
613
exitstatus = EXIT_FAILURE;
703
char **new_argv = realloc(custom_argv, sizeof(char *)
706
if(new_argv == NULL){
707
error(0, errno, "realloc");
708
exitstatus = EX_OSERR;
713
custom_argv = new_argv;
617
716
custom_argv[custom_argc-1] = new_arg;
618
custom_argv[custom_argc] = NULL;
717
custom_argv[custom_argc] = NULL;
721
ret = fclose(conffp);
722
} while(ret == EOF and errno == EINTR);
724
error(0, errno, "fclose");
725
exitstatus = EX_IOERR;
623
730
/* Check for harmful errors and go to fallback. Other errors might
624
731
not affect opening plugins */
625
732
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
627
exitstatus = EXIT_FAILURE;
733
error(0, errno, "fopen");
734
exitstatus = EX_OSERR;
631
/* If there was any arguments from configuration file,
632
pass them to parser as command arguments */
738
/* If there were any arguments from the configuration file, pass
739
them to parser as command line arguments */
633
740
if(custom_argv != NULL){
634
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
636
if(ret == ARGP_ERR_UNKNOWN){
637
fprintf(stderr, "Unknown error while parsing arguments\n");
638
exitstatus = EXIT_FAILURE;
741
ret = argp_parse(&argp, custom_argc, custom_argv,
742
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
750
error(0, errno, "argp_parse");
751
exitstatus = EX_OSERR;
754
exitstatus = EX_CONFIG;
643
759
/* Parse actual command line arguments, to let them override the
645
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
646
if(ret == ARGP_ERR_UNKNOWN){
647
fprintf(stderr, "Unknown error while parsing arguments\n");
648
exitstatus = EXIT_FAILURE;
761
ret = argp_parse(&argp, argc, argv,
762
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
770
error(0, errno, "argp_parse");
771
exitstatus = EX_OSERR;
774
exitstatus = EX_USAGE;
779
char *pluginhelperenv;
781
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
782
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
784
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
786
if(ret == -1 or not bret){
787
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
788
" environment variable to \"%s\" for all plugins\n",
789
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
792
free(pluginhelperenv);
666
/* Strip permissions down to nobody */
811
/* Work around Debian bug #633582:
812
<http://bugs.debian.org/633582> */
813
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
814
if(plugindir_fd == -1){
816
error(0, errno, "open(\"" PDIR "\")");
819
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
821
error(0, errno, "fstat");
823
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
824
ret = fchown(plugindir_fd, uid, gid);
826
error(0, errno, "fchown");
834
/* Lower permissions */
837
error(0, errno, "setgid");
671
839
ret = setuid(uid);
676
if(plugindir == NULL){
679
dir = opendir(plugindir);
683
perror("Could not open plugin dir");
684
exitstatus = EXIT_FAILURE;
688
/* Set the FD_CLOEXEC flag on the directory, if possible */
841
error(0, errno, "setuid");
844
/* Open plugin directory with close_on_exec flag */
690
int dir_fd = dirfd(dir);
692
ret = set_cloexec_flag(dir_fd);
694
perror("set_cloexec_flag");
695
exitstatus = EXIT_FAILURE;
846
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
849
#else /* not O_CLOEXEC */
851
#endif /* not O_CLOEXEC */
854
error(0, errno, "Could not open plugin dir");
855
exitstatus = EX_UNAVAILABLE;
860
/* Set the FD_CLOEXEC flag on the directory */
861
ret = set_cloexec_flag(dir_fd);
863
error(0, errno, "set_cloexec_flag");
864
exitstatus = EX_OSERR;
867
#endif /* O_CLOEXEC */
870
int good_name(const struct dirent * const dirent){
871
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
872
"*.dpkg-old", "*.dpkg-bak",
873
"*.dpkg-divert", NULL };
875
#pragma GCC diagnostic push
876
#pragma GCC diagnostic ignored "-Wcast-qual"
878
for(const char **pat = (const char **)patterns;
879
*pat != NULL; pat++){
881
#pragma GCC diagnostic pop
883
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
886
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
887
" matching pattern %s\n", dirent->d_name, *pat);
896
#if __GLIBC_PREREQ(2, 15)
897
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
899
#else /* not __GLIBC_PREREQ(2, 15) */
900
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
901
&direntries, good_name, alphasort);
902
#endif /* not __GLIBC_PREREQ(2, 15) */
903
#else /* not __GLIBC__ */
904
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
905
&direntries, good_name, alphasort);
906
#endif /* not __GLIBC__ */
907
if(numplugins == -1){
908
error(0, errno, "Could not scan plugin dir");
910
exitstatus = EX_OSERR;
701
914
FD_ZERO(&rfds_all);
703
916
/* Read and execute any executable in the plugin directory*/
705
dirst = readdir(dir);
707
/* All directory entries have been processed */
711
exitstatus = EXIT_FAILURE;
717
d_name_len = strlen(dirst->d_name);
719
/* Ignore dotfiles, backup files and other junk */
721
bool bad_name = false;
723
const char const *bad_prefixes[] = { ".", "#", NULL };
725
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
728
".dpkg-divert", NULL };
729
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
730
size_t pre_len = strlen(*pre);
731
if((d_name_len >= pre_len)
732
and strncmp((dirst->d_name), *pre, pre_len) == 0){
734
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
735
" with bad prefix %s\n", dirst->d_name, *pre);
744
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
745
size_t suf_len = strlen(*suf);
746
if((d_name_len >= suf_len)
747
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
750
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
751
" with bad suffix %s\n", dirst->d_name, *suf);
764
if(plugindir == NULL){
765
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
767
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
917
for(int i = 0; i < numplugins; i++){
919
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
921
error(0, errno, "Could not open plugin");
774
ret = stat(filename, &st);
925
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
927
error(0, errno, "stat");
781
933
/* Ignore non-executable files */
782
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
934
if(not S_ISREG(st.st_mode)
935
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
784
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
785
" with bad type or mode\n", filename);
938
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
939
" with bad type or mode\n",
940
plugindir != NULL ? plugindir : PDIR,
941
direntries[i]->d_name);
791
plugin *p = getplugin(dirst->d_name);
948
plugin *p = getplugin(direntries[i]->d_name);
950
error(0, errno, "getplugin");
799
957
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
958
direntries[i]->d_name);
809
968
for(char **a = g->argv + 1; *a != NULL; a++){
810
969
if(not add_argument(p, *a)){
811
perror("add_argument");
970
error(0, errno, "add_argument");
814
973
/* Add global environment variables */
815
974
for(char **e = g->environ; *e != NULL; e++){
816
975
if(not add_environment(p, *e, false)){
817
perror("add_environment");
976
error(0, errno, "add_environment");
822
/* If this plugin has any environment variables, we will call
823
using execve and need to duplicate the environment from this
981
/* If this plugin has any environment variables, we need to
982
duplicate the environment from this process, too. */
825
983
if(p->environ[0] != NULL){
826
984
for(char **e = environ; *e != NULL; e++){
827
985
if(not add_environment(p, *e, false)){
828
perror("add_environment");
986
error(0, errno, "add_environment");
993
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
994
#else /* O_CLOEXEC */
995
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
996
#endif /* O_CLOEXEC */
837
exitstatus = EXIT_FAILURE;
998
error(0, errno, "pipe");
999
exitstatus = EX_OSERR;
1000
free(direntries[i]);
1003
if(pipefd[0] >= FD_SETSIZE){
1004
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
1008
exitstatus = EX_OSERR;
1009
free(direntries[i]);
840
1013
/* Ask OS to automatic close the pipe on exec */
841
1014
ret = set_cloexec_flag(pipefd[0]);
843
perror("set_cloexec_flag");
844
exitstatus = EXIT_FAILURE;
1016
error(0, errno, "set_cloexec_flag");
1019
exitstatus = EX_OSERR;
1020
free(direntries[i]);
847
1023
ret = set_cloexec_flag(pipefd[1]);
849
perror("set_cloexec_flag");
850
exitstatus = EXIT_FAILURE;
1025
error(0, errno, "set_cloexec_flag");
1028
exitstatus = EX_OSERR;
1029
free(direntries[i]);
1032
#endif /* not O_CLOEXEC */
853
1033
/* Block SIGCHLD until process is safely in process list */
854
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1035
&sigchld_action.sa_mask,
856
perror("sigprocmask");
857
exitstatus = EXIT_FAILURE;
1038
error(0, errno, "sigprocmask");
1039
exitstatus = EX_OSERR;
1040
free(direntries[i]);
860
1043
/* Starting a new process to be watched */
1047
} while(pid == -1 and errno == EINTR);
864
exitstatus = EXIT_FAILURE;
1049
error(0, errno, "fork");
1050
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1051
&sigchld_action.sa_mask, NULL));
1054
exitstatus = EX_OSERR;
1055
free(direntries[i]);
868
1059
/* this is the child process */
869
1060
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1062
error(0, errno, "sigaction");
874
1065
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
876
perror("sigprocmask");
1067
error(0, errno, "sigprocmask");
880
1071
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1073
error(0, errno, "dup2");
887
/* If dir has no file descriptor, we could not set FD_CLOEXEC
888
above and must now close it manually here. */
891
if(p->environ[0] == NULL){
892
if(execv(filename, p->argv) < 0){
897
if(execve(filename, p->argv, p->environ) < 0){
1077
if(fexecve(plugin_fd, p->argv,
1078
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1079
error(0, errno, "fexecve for %s/%s",
1080
plugindir != NULL ? plugindir : PDIR,
1081
direntries[i]->d_name);
904
1086
/* Parent process */
905
1087
close(pipefd[1]); /* Close unused write end of pipe */
907
plugin *new_plugin = getplugin(dirst->d_name);
1089
plugin *new_plugin = getplugin(direntries[i]->d_name);
908
1090
if(new_plugin == NULL){
910
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1091
error(0, errno, "getplugin");
1092
ret = (int)(TEMP_FAILURE_RETRY
1093
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
912
perror("sigprocmask");
1096
error(0, errno, "sigprocmask");
914
exitstatus = EXIT_FAILURE;
1098
exitstatus = EX_OSERR;
1099
free(direntries[i]);
1102
free(direntries[i]);
918
1104
new_plugin->pid = pid;
919
1105
new_plugin->fd = pipefd[0];
921
1107
/* Unblock SIGCHLD so signal handler can be run if this process
922
1108
has already completed */
923
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1109
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1110
&sigchld_action.sa_mask,
925
perror("sigprocmask");
926
exitstatus = EXIT_FAILURE;
1113
error(0, errno, "sigprocmask");
1114
exitstatus = EX_OSERR;
930
FD_SET(new_plugin->fd, &rfds_all);
1118
#if defined (__GNUC__) and defined (__GLIBC__)
1119
#if not __GLIBC_PREREQ(2, 16)
1120
#pragma GCC diagnostic push
1121
#pragma GCC diagnostic ignored "-Wsign-conversion"
1124
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1125
-Wconversion in GNU libc
1127
#if defined (__GNUC__) and defined (__GLIBC__)
1128
#if not __GLIBC_PREREQ(2, 16)
1129
#pragma GCC diagnostic pop
932
1133
if(maxfd < new_plugin->fd){
933
1134
maxfd = new_plugin->fd;
1142
free_plugin(getplugin(NULL));
940
1144
for(plugin *p = plugin_list; p != NULL; p = p->next){
941
1145
if(p->pid != 0){
966
1170
if(not WIFEXITED(proc->status)
967
1171
or WEXITSTATUS(proc->status) != 0){
968
1172
/* Bad exit by plugin */
971
1175
if(WIFEXITED(proc->status)){
972
fprintf(stderr, "Plugin %" PRIdMAX " exited with status"
973
" %d\n", (intmax_t) (proc->pid),
1176
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1177
" status %d\n", proc->name,
1178
(intmax_t) (proc->pid),
974
1179
WEXITSTATUS(proc->status));
975
1180
} else if(WIFSIGNALED(proc->status)){
976
fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"
977
" %d\n", (intmax_t) (proc->pid),
978
WTERMSIG(proc->status));
1181
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1182
" signal %d: %s\n", proc->name,
1183
(intmax_t) (proc->pid),
1184
WTERMSIG(proc->status),
1185
strsignal(WTERMSIG(proc->status)));
979
1186
} else if(WCOREDUMP(proc->status)){
980
fprintf(stderr, "Plugin %" PRIdMAX " dumped core\n",
981
(intmax_t) (proc->pid));
1187
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1188
" core\n", proc->name, (intmax_t) (proc->pid));
985
1192
/* Remove the plugin */
986
FD_CLR(proc->fd, &rfds_all);
1193
#if defined (__GNUC__) and defined (__GLIBC__)
1194
#if not __GLIBC_PREREQ(2, 16)
1195
#pragma GCC diagnostic push
1196
#pragma GCC diagnostic ignored "-Wsign-conversion"
1199
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1200
-Wconversion in GNU libc
1202
#if defined (__GNUC__) and defined (__GLIBC__)
1203
#if not __GLIBC_PREREQ(2, 16)
1204
#pragma GCC diagnostic pop
988
1208
/* Block signal while modifying process_list */
989
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1209
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1211
&sigchld_action.sa_mask,
991
perror("sigprocmask");
992
exitstatus = EXIT_FAILURE;
1214
error(0, errno, "sigprocmask");
1215
exitstatus = EX_OSERR;
1018
1242
bool bret = print_out_password(proc->buffer,
1019
1243
proc->buffer_length);
1021
perror("print_out_password");
1022
exitstatus = EXIT_FAILURE;
1245
error(0, errno, "print_out_password");
1246
exitstatus = EX_IOERR;
1027
1251
/* This process has not completed. Does it have any output? */
1028
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1252
#if defined (__GNUC__) and defined (__GLIBC__)
1253
#if not __GLIBC_PREREQ(2, 16)
1254
#pragma GCC diagnostic push
1255
#pragma GCC diagnostic ignored "-Wsign-conversion"
1258
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1264
#if defined (__GNUC__) and defined (__GLIBC__)
1265
#if not __GLIBC_PREREQ(2, 16)
1266
#pragma GCC diagnostic pop
1029
1269
/* This process had nothing to say at this time */
1030
1270
proc = proc->next;
1033
1273
/* Before reading, make the process' data buffer large enough */
1034
1274
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1035
proc->buffer = realloc(proc->buffer, proc->buffer_size
1036
+ (size_t) BUFFER_SIZE);
1037
if(proc->buffer == NULL){
1039
exitstatus = EXIT_FAILURE;
1275
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1276
+ (size_t) BUFFER_SIZE);
1277
if(new_buffer == NULL){
1278
error(0, errno, "malloc");
1279
exitstatus = EX_OSERR;
1282
proc->buffer = new_buffer;
1042
1283
proc->buffer_size += BUFFER_SIZE;
1044
1285
/* Read from the process */
1045
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1286
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1288
+ proc->buffer_length,
1048
1291
/* Read error from this process; ignore the error */
1049
1292
proc = proc->next;