To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 24.1.139
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.139
- Committer: Björn Påhlsson
- Date: 2009-09-07 22:21:35 UTC
- mfrom: (237.2.121 mandos)
- mto: (237.7.1 mandos) (24.1.154 mandos)
- mto: This revision was merged to the branch mainline in revision 270.
- Revision ID: belorn@braxen-20090907222135-pk7qmvsg3bmqqo5i
merge
- files modified:
- Makefile
added
removed
plugin-runner.c
1
/* -*- coding: utf-8; mode: c; mode: orgtbl -*- */
1
/* -*- coding: utf-8 -*- */
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf(), O_CLOEXEC */
26
asprintf() */
27
27
#include <stddef.h> /* size_t, NULL */
28
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
29
EXIT_SUCCESS, realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
35
35
WEXITSTATUS(), wait(), pid_t,
36
36
uid_t, gid_t, getuid(), getgid(),
42
42
WCOREDUMP() */
43
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
44
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
45
#include <dirent.h> /* DIR, struct dirent, opendir(),
46
46
readdir(), closedir(), dirfd() */
47
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
48
fcntl(), setuid(), setgid(),
68
68
*/
69
69
#include <errno.h> /* errno, EBADF */
70
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE */
72
71
73
72
#define BUFFER_SIZE 256
74
73
103
102
/* Gets an existing plugin based on name,
104
103
or if none is found, creates a new one */
105
104
static plugin *getplugin(char *name){
106
/* Check for existing plugin with that name */
105
/* Check for exiting plugin with that name */
107
106
for(plugin *p = plugin_list; p != NULL; p = p->next){
108
107
if((p->name == name)
109
108
or (p->name and name and (strcmp(p->name, name) == 0))){
111
110
}
112
111
}
113
112
/* Create a new plugin */
114
plugin *new_plugin = NULL;
115
do {
116
new_plugin = malloc(sizeof(plugin));
117
} while(new_plugin == NULL and errno == EINTR);
113
plugin *new_plugin = malloc(sizeof(plugin));
118
114
if(new_plugin == NULL){
119
115
return NULL;
120
116
}
121
117
char *copy_name = NULL;
122
118
if(name != NULL){
123
do {
124
copy_name = strdup(name);
125
} while(copy_name == NULL and errno == EINTR);
119
copy_name = strdup(name);
126
120
if(copy_name == NULL){
127
int e = errno;
128
121
free(new_plugin);
129
errno = e;
130
122
return NULL;
131
123
}
132
124
}
136
128
.disabled = false,
137
129
.next = plugin_list };
138
130
139
do {
140
new_plugin->argv = malloc(sizeof(char *) * 2);
141
} while(new_plugin->argv == NULL and errno == EINTR);
131
new_plugin->argv = malloc(sizeof(char *) * 2);
142
132
if(new_plugin->argv == NULL){
143
int e = errno;
144
133
free(copy_name);
145
134
free(new_plugin);
146
errno = e;
147
135
return NULL;
148
136
}
149
137
new_plugin->argv[0] = copy_name;
150
138
new_plugin->argv[1] = NULL;
151
139
152
do {
153
new_plugin->environ = malloc(sizeof(char *));
154
} while(new_plugin->environ == NULL and errno == EINTR);
140
new_plugin->environ = malloc(sizeof(char *));
155
141
if(new_plugin->environ == NULL){
156
int e = errno;
157
142
free(copy_name);
158
143
free(new_plugin->argv);
159
144
free(new_plugin);
160
errno = e;
161
145
return NULL;
162
146
}
163
147
new_plugin->environ[0] = NULL;
171
155
static bool add_to_char_array(const char *new, char ***array,
172
156
int *len){
173
157
/* Resize the pointed-to array to hold one more pointer */
174
do {
175
*array = realloc(*array, sizeof(char *)
176
* (size_t) ((*len) + 2));
177
} while(*array == NULL and errno == EINTR);
158
*array = realloc(*array, sizeof(char *)
159
* (size_t) ((*len) + 2));
178
160
/* Malloc check */
179
161
if(*array == NULL){
180
162
return false;
181
163
}
182
164
/* Make a copy of the new string */
183
char *copy;
184
do {
185
copy = strdup(new);
186
} while(copy == NULL and errno == EINTR);
165
char *copy = strdup(new);
187
166
if(copy == NULL){
188
167
return false;
189
168
}
215
194
if(strncmp(*e, def, namelen + 1) == 0){
216
195
/* It already exists */
217
196
if(replace){
218
char *new;
219
do {
220
new = realloc(*e, strlen(def) + 1);
221
} while(new == NULL and errno == EINTR);
197
char *new = realloc(*e, strlen(def) + 1);
222
198
if(new == NULL){
223
199
return false;
224
200
}
234
210
/*
235
211
* Based on the example in the GNU LibC manual chapter 13.13 "File
236
212
* Descriptor Flags".
237
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
213
* *Note File Descriptor Flags:(libc)Descriptor Flags.
238
214
*/
239
215
static int set_cloexec_flag(int fd){
240
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
216
int ret = fcntl(fd, F_GETFD, 0);
241
217
/* If reading the flags failed, return error indication now. */
242
218
if(ret < 0){
243
219
return ret;
244
220
}
245
221
/* Store modified flag word in the descriptor. */
246
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
247
ret | FD_CLOEXEC));
222
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
248
223
}
249
224
250
225
342
317
fd_set rfds_all;
343
318
int ret, maxfd = 0;
344
319
ssize_t sret;
320
intmax_t tmpmax;
345
321
uid_t uid = 65534;
346
322
gid_t gid = 65534;
347
323
bool debug = false;
401
377
.doc = "Group ID the plugins will run as", .group = 3 },
402
378
{ .name = "debug", .key = 132,
403
379
.doc = "Debug mode", .group = 4 },
404
/*
405
* These reproduce what we would get without ARGP_NO_HELP
406
*/
407
{ .name = "help", .key = '?',
408
.doc = "Give this help list", .group = -1 },
409
{ .name = "usage", .key = -3,
410
.doc = "Give a short usage message", .group = -1 },
411
{ .name = "version", .key = 'V',
412
.doc = "Print program version", .group = -1 },
413
380
{ .name = NULL }
414
381
};
415
382
416
error_t parse_opt(int key, char *arg, struct argp_state *state){
417
errno = 0;
383
error_t parse_opt(int key, char *arg, __attribute__((unused))
384
struct argp_state *state){
385
char *tmp;
418
386
switch(key){
419
char *tmp;
420
intmax_t tmpmax;
421
387
case 'g': /* --global-options */
422
{
388
if(arg != NULL){
423
389
char *plugin_option;
424
390
while((plugin_option = strsep(&arg, ",")) != NULL){
391
if(plugin_option[0] == '\0'){
392
continue;
393
}
425
394
if(not add_argument(getplugin(NULL), plugin_option)){
426
break;
395
perror("add_argument");
396
return ARGP_ERR_UNKNOWN;
427
397
}
428
398
}
429
399
}
430
400
break;
431
401
case 'G': /* --global-env */
432
add_environment(getplugin(NULL), arg, true);
402
if(arg == NULL){
403
break;
404
}
405
if(not add_environment(getplugin(NULL), arg, true)){
406
perror("add_environment");
407
}
433
408
break;
434
409
case 'o': /* --options-for */
435
{
436
char *option_list = strchr(arg, ':');
437
if(option_list == NULL){
438
argp_error(state, "No colon in \"%s\"", arg);
439
errno = EINVAL;
440
break;
441
}
442
*option_list = '\0';
443
option_list++;
444
if(arg[0] == '\0'){
445
argp_error(state, "Empty plugin name");
446
errno = EINVAL;
447
break;
448
}
449
char *option;
450
while((option = strsep(&option_list, ",")) != NULL){
451
if(not add_argument(getplugin(arg), option)){
452
break;
410
if(arg != NULL){
411
char *plugin_name = strsep(&arg, ":");
412
if(plugin_name[0] == '\0'){
413
break;
414
}
415
char *plugin_option;
416
while((plugin_option = strsep(&arg, ",")) != NULL){
417
if(not add_argument(getplugin(plugin_name), plugin_option)){
418
perror("add_argument");
419
return ARGP_ERR_UNKNOWN;
453
420
}
454
421
}
455
422
}
456
423
break;
457
424
case 'E': /* --env-for */
425
if(arg == NULL){
426
break;
427
}
458
428
{
459
429
char *envdef = strchr(arg, ':');
460
430
if(envdef == NULL){
461
argp_error(state, "No colon in \"%s\"", arg);
462
errno = EINVAL;
463
431
break;
464
432
}
465
433
*envdef = '\0';
466
envdef++;
467
if(arg[0] == '\0'){
468
argp_error(state, "Empty plugin name");
469
errno = EINVAL;
470
break;
434
if(not add_environment(getplugin(arg), envdef+1, true)){
435
perror("add_environment");
471
436
}
472
add_environment(getplugin(arg), envdef, true);
473
437
}
474
438
break;
475
439
case 'd': /* --disable */
476
{
440
if(arg != NULL){
477
441
plugin *p = getplugin(arg);
478
if(p != NULL){
479
p->disabled = true;
442
if(p == NULL){
443
return ARGP_ERR_UNKNOWN;
480
444
}
445
p->disabled = true;
481
446
}
482
447
break;
483
448
case 'e': /* --enable */
484
{
449
if(arg != NULL){
485
450
plugin *p = getplugin(arg);
486
if(p != NULL){
487
p->disabled = false;
451
if(p == NULL){
452
return ARGP_ERR_UNKNOWN;
488
453
}
454
p->disabled = false;
489
455
}
490
456
break;
491
457
case 128: /* --plugin-dir */
492
458
free(plugindir);
493
459
plugindir = strdup(arg);
460
if(plugindir == NULL){
461
perror("strdup");
462
}
494
463
break;
495
464
case 129: /* --config-file */
496
465
/* This is already done by parse_opt_config_file() */
497
466
break;
498
467
case 130: /* --userid */
468
errno = 0;
499
469
tmpmax = strtoimax(arg, &tmp, 10);
500
470
if(errno != 0 or tmp == arg or *tmp != '\0'
501
471
or tmpmax != (uid_t)tmpmax){
502
argp_error(state, "Bad user ID number: \"%s\", using %"
503
PRIdMAX, arg, (intmax_t)uid);
504
break;
472
fprintf(stderr, "Bad user ID number: \"%s\", using %"
473
PRIdMAX "\n", arg, (intmax_t)uid);
474
} else {
475
uid = (uid_t)tmpmax;
505
476
}
506
uid = (uid_t)tmpmax;
507
477
break;
508
478
case 131: /* --groupid */
479
errno = 0;
509
480
tmpmax = strtoimax(arg, &tmp, 10);
510
481
if(errno != 0 or tmp == arg or *tmp != '\0'
511
482
or tmpmax != (gid_t)tmpmax){
512
argp_error(state, "Bad group ID number: \"%s\", using %"
513
PRIdMAX, arg, (intmax_t)gid);
514
break;
483
fprintf(stderr, "Bad group ID number: \"%s\", using %"
484
PRIdMAX "\n", arg, (intmax_t)gid);
485
} else {
486
gid = (gid_t)tmpmax;
515
487
}
516
gid = (gid_t)tmpmax;
517
488
break;
518
489
case 132: /* --debug */
519
490
debug = true;
520
491
break;
521
/*
522
* These reproduce what we would get without ARGP_NO_HELP
523
*/
524
case '?': /* --help */
525
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
526
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
527
case -3: /* --usage */
528
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
529
argp_state_help(state, state->out_stream,
530
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
531
case 'V': /* --version */
532
fprintf(state->out_stream, "%s\n", argp_program_version);
533
exit(EXIT_SUCCESS);
534
break;
535
492
/*
536
493
* When adding more options before this line, remember to also add a
537
494
* "case" to the "parse_opt_config_file" function below.
540
497
/* Cryptsetup always passes an argument, which is an empty
541
498
string if "none" was specified in /etc/crypttab. So if
542
499
argument was empty, we ignore it silently. */
543
if(arg[0] == '\0'){
544
break;
500
if(arg[0] != '\0'){
501
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
545
502
}
503
break;
504
case ARGP_KEY_END:
505
break;
546
506
default:
547
507
return ARGP_ERR_UNKNOWN;
548
508
}
549
return errno; /* Set to 0 at start */
509
return 0;
550
510
}
551
511
552
512
/* This option parser is the same as parse_opt() above, except it
554
514
error_t parse_opt_config_file(int key, char *arg,
555
515
__attribute__((unused))
556
516
struct argp_state *state){
557
errno = 0;
558
517
switch(key){
559
518
case 'g': /* --global-options */
560
519
case 'G': /* --global-env */
567
526
case 129: /* --config-file */
568
527
free(argfile);
569
528
argfile = strdup(arg);
529
if(argfile == NULL){
530
perror("strdup");
531
}
570
532
break;
571
533
case 130: /* --userid */
572
534
case 131: /* --groupid */
573
535
case 132: /* --debug */
574
case '?': /* --help */
575
case -3: /* --usage */
576
case 'V': /* --version */
577
536
case ARGP_KEY_ARG:
537
case ARGP_KEY_END:
578
538
break;
579
539
default:
580
540
return ARGP_ERR_UNKNOWN;
581
541
}
582
return errno;
542
return 0;
583
543
}
584
544
585
545
struct argp argp = { .options = options,
589
549
590
550
/* Parse using parse_opt_config_file() in order to get the custom
591
551
config file location, if any. */
592
ret = argp_parse(&argp, argc, argv,
593
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
594
NULL, NULL);
595
switch(ret){
596
case 0:
597
break;
598
case ENOMEM:
599
default:
600
errno = ret;
601
perror("argp_parse");
602
exitstatus = EX_OSERR;
603
goto fallback;
604
case EINVAL:
605
exitstatus = EX_USAGE;
552
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
553
if(ret == ARGP_ERR_UNKNOWN){
554
fprintf(stderr, "Unknown error while parsing arguments\n");
555
exitstatus = EXIT_FAILURE;
606
556
goto fallback;
607
557
}
608
558
667
617
custom_argv[custom_argc] = NULL;
668
618
}
669
619
}
670
do {
671
ret = fclose(conffp);
672
} while(ret == EOF and errno == EINTR);
673
if(ret == EOF){
674
perror("fclose");
675
exitstatus = EXIT_FAILURE;
676
goto fallback;
677
}
678
620
free(org_line);
679
621
} else {
680
622
/* Check for harmful errors and go to fallback. Other errors might
685
627
goto fallback;
686
628
}
687
629
}
688
/* If there were any arguments from the configuration file, pass
689
them to parser as command line arguments */
630
/* If there was any arguments from configuration file,
631
pass them to parser as command arguments */
690
632
if(custom_argv != NULL){
691
ret = argp_parse(&argp, custom_argc, custom_argv,
692
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
693
NULL, NULL);
694
switch(ret){
695
case 0:
696
break;
697
case ENOMEM:
698
default:
699
errno = ret;
700
perror("argp_parse");
701
exitstatus = EX_OSERR;
702
goto fallback;
703
case EINVAL:
704
exitstatus = EX_CONFIG;
633
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
634
0, NULL);
635
if(ret == ARGP_ERR_UNKNOWN){
636
fprintf(stderr, "Unknown error while parsing arguments\n");
637
exitstatus = EXIT_FAILURE;
705
638
goto fallback;
706
639
}
707
640
}
708
641
709
642
/* Parse actual command line arguments, to let them override the
710
643
config file */
711
ret = argp_parse(&argp, argc, argv,
712
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
713
NULL, NULL);
714
switch(ret){
715
case 0:
716
break;
717
case ENOMEM:
718
default:
719
errno = ret;
720
perror("argp_parse");
721
exitstatus = EX_OSERR;
722
goto fallback;
723
case EINVAL:
724
exitstatus = EX_USAGE;
644
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
645
if(ret == ARGP_ERR_UNKNOWN){
646
fprintf(stderr, "Unknown error while parsing arguments\n");
647
exitstatus = EXIT_FAILURE;
725
648
goto fallback;
726
649
}
727
650
749
672
perror("setuid");
750
673
}
751
674
752
/* Open plugin directory with close_on_exec flag */
675
if(plugindir == NULL){
676
dir = opendir(PDIR);
677
} else {
678
dir = opendir(plugindir);
679
}
680
681
if(dir == NULL){
682
perror("Could not open plugin dir");
683
exitstatus = EXIT_FAILURE;
684
goto fallback;
685
}
686
687
/* Set the FD_CLOEXEC flag on the directory, if possible */
753
688
{
754
int dir_fd = -1;
755
if(plugindir == NULL){
756
dir_fd = open(PDIR, O_RDONLY |
757
#ifdef O_CLOEXEC
758
O_CLOEXEC
759
#else /* not O_CLOEXEC */
760
0
761
#endif /* not O_CLOEXEC */
762
);
763
} else {
764
dir_fd = open(plugindir, O_RDONLY |
765
#ifdef O_CLOEXEC
766
O_CLOEXEC
767
#else /* not O_CLOEXEC */
768
0
769
#endif /* not O_CLOEXEC */
770
);
771
}
772
if(dir_fd == -1){
773
perror("Could not open plugin dir");
774
exitstatus = EXIT_FAILURE;
775
goto fallback;
776
}
777
778
#ifndef O_CLOEXEC
779
/* Set the FD_CLOEXEC flag on the directory */
780
ret = set_cloexec_flag(dir_fd);
781
if(ret < 0){
782
perror("set_cloexec_flag");
783
TEMP_FAILURE_RETRY(close(dir_fd));
784
exitstatus = EXIT_FAILURE;
785
goto fallback;
786
}
787
#endif /* O_CLOEXEC */
788
789
dir = fdopendir(dir_fd);
790
if(dir == NULL){
791
perror("Could not open plugin dir");
792
TEMP_FAILURE_RETRY(close(dir_fd));
793
exitstatus = EXIT_FAILURE;
794
goto fallback;
689
int dir_fd = dirfd(dir);
690
if(dir_fd >= 0){
691
ret = set_cloexec_flag(dir_fd);
692
if(ret < 0){
693
perror("set_cloexec_flag");
694
exitstatus = EXIT_FAILURE;
695
goto fallback;
696
}
795
697
}
796
698
}
797
699
799
701
800
702
/* Read and execute any executable in the plugin directory*/
801
703
while(true){
802
do {
803
dirst = readdir(dir);
804
} while(dirst == NULL and errno == EINTR);
704
dirst = readdir(dir);
805
705
806
706
/* All directory entries have been processed */
807
707
if(dirst == NULL){
861
761
862
762
char *filename;
863
763
if(plugindir == NULL){
864
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
865
dirst->d_name));
764
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
866
765
} else {
867
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
868
plugindir,
869
dirst->d_name));
766
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
870
767
}
871
768
if(ret < 0){
872
769
perror("asprintf");
873
770
continue;
874
771
}
875
772
876
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
773
ret = stat(filename, &st);
877
774
if(ret == -1){
878
775
perror("stat");
879
776
free(filename);
881
778
}
882
779
883
780
/* Ignore non-executable files */
884
if(not S_ISREG(st.st_mode)
885
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
781
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
886
782
if(debug){
887
783
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
888
784
" with bad type or mode\n", filename);
934
830
}
935
831
936
832
int pipefd[2];
937
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
833
ret = pipe(pipefd);
938
834
if(ret == -1){
939
835
perror("pipe");
940
836
exitstatus = EXIT_FAILURE;
954
850
goto fallback;
955
851
}
956
852
/* Block SIGCHLD until process is safely in process list */
957
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
958
&sigchld_action.sa_mask,
959
NULL));
853
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
960
854
if(ret < 0){
961
855
perror("sigprocmask");
962
856
exitstatus = EXIT_FAILURE;
963
857
goto fallback;
964
858
}
965
859
/* Starting a new process to be watched */
966
pid_t pid;
967
do {
968
pid = fork();
969
} while(pid == -1 and errno == EINTR);
860
pid_t pid = fork();
970
861
if(pid == -1){
971
862
perror("fork");
972
863
exitstatus = EXIT_FAILURE;
1010
901
/* no return */
1011
902
}
1012
903
/* Parent process */
1013
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1014
pipe */
904
close(pipefd[1]); /* Close unused write end of pipe */
1015
905
free(filename);
1016
906
plugin *new_plugin = getplugin(dirst->d_name);
1017
907
if(new_plugin == NULL){
1018
908
perror("getplugin");
1019
ret = (int)(TEMP_FAILURE_RETRY
1020
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1021
NULL)));
909
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1022
910
if(ret < 0){
1023
911
perror("sigprocmask");
1024
912
}
1031
919
1032
920
/* Unblock SIGCHLD so signal handler can be run if this process
1033
921
has already completed */
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1035
&sigchld_action.sa_mask,
1036
NULL));
922
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1037
923
if(ret < 0){
1038
924
perror("sigprocmask");
1039
925
exitstatus = EXIT_FAILURE;
1040
926
goto fallback;
1041
927
}
1042
928
1043
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1044
-Wconversion */
929
FD_SET(new_plugin->fd, &rfds_all);
1045
930
1046
931
if(maxfd < new_plugin->fd){
1047
932
maxfd = new_plugin->fd;
1048
933
}
1049
934
}
1050
935
1051
TEMP_FAILURE_RETRY(closedir(dir));
936
closedir(dir);
1052
937
dir = NULL;
1053
938
free_plugin(getplugin(NULL));
1054
939
1067
952
while(plugin_list){
1068
953
fd_set rfds = rfds_all;
1069
954
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1070
if(select_ret == -1 and errno != EINTR){
955
if(select_ret == -1){
1071
956
perror("select");
1072
957
exitstatus = EXIT_FAILURE;
1073
958
goto fallback;
1101
986
}
1102
987
1103
988
/* Remove the plugin */
1104
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1105
-Wconversion */
989
FD_CLR(proc->fd, &rfds_all);
1106
990
1107
991
/* Block signal while modifying process_list */
1108
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1109
(SIG_BLOCK,
1110
&sigchld_action.sa_mask,
1111
NULL));
992
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1112
993
if(ret < 0){
1113
994
perror("sigprocmask");
1114
995
exitstatus = EXIT_FAILURE;
1120
1001
proc = next_plugin;
1121
1002
1122
1003
/* We are done modifying process list, so unblock signal */
1123
ret = (int)(TEMP_FAILURE_RETRY
1124
(sigprocmask(SIG_UNBLOCK,
1125
&sigchld_action.sa_mask, NULL)));
1004
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1005
NULL);
1126
1006
if(ret < 0){
1127
1007
perror("sigprocmask");
1128
1008
exitstatus = EXIT_FAILURE;
1148
1028
}
1149
1029
1150
1030
/* This process has not completed. Does it have any output? */
1151
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1152
warning from
1153
-Wconversion */
1031
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1154
1032
/* This process had nothing to say at this time */
1155
1033
proc = proc->next;
1156
1034
continue;
1167
1045
proc->buffer_size += BUFFER_SIZE;
1168
1046
}
1169
1047
/* Read from the process */
1170
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1171
proc->buffer
1172
+ proc->buffer_length,
1173
BUFFER_SIZE));
1048
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1049
BUFFER_SIZE);
1174
1050
if(sret < 0){
1175
1051
/* Read error from this process; ignore the error */
1176
1052
proc = proc->next;
1238
1114
}
1239
1115
1240
1116
/* Wait for any remaining child processes to terminate */
1241
do {
1117
do{
1242
1118
ret = wait(NULL);
1243
1119
} while(ret >= 0);
1244
1120
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0