To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 237.4.44
- compare with another revision
- download diff
- download tarball
- view history from revision 237.4.44
- Committer: Teddy Hogeborn
- Date: 2014-05-13 06:06:28 UTC
- mfrom: (683 trunk)
- mto: This revision was merged to the branch mainline in revision 684.
- Revision ID: teddy@recompile.se-20140513060628-9wpzoh97hape9ub8
Merge from trunk.
- files added:
- initramfs-tools-hook-conf
- files removed:
- bugs.xml
- debian/tests
- dracut-module
- plugin-helpers
- files modified:
- .bzrignore
added
removed
plugin-runner.c
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008-2020 Teddy Hogeborn
6
* Copyright © 2008-2020 Björn Påhlsson
7
*
8
* This file is part of Mandos.
9
*
10
* Mandos is free software: you can redistribute it and/or modify it
11
* under the terms of the GNU General Public License as published by
12
* the Free Software Foundation, either version 3 of the License, or
13
* (at your option) any later version.
14
*
15
* Mandos is distributed in the hope that it will be useful, but
5
* Copyright © 2008-2014 Teddy Hogeborn
6
* Copyright © 2008-2014 Björn Påhlsson
7
*
8
* This program is free software: you can redistribute it and/or
9
* modify it under the terms of the GNU General Public License as
10
* published by the Free Software Foundation, either version 3 of the
11
* License, or (at your option) any later version.
12
*
13
* This program is distributed in the hope that it will be useful, but
16
14
* WITHOUT ANY WARRANTY; without even the implied warranty of
17
15
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18
16
* General Public License for more details.
19
17
*
20
18
* You should have received a copy of the GNU General Public License
21
* along with Mandos. If not, see <http://www.gnu.org/licenses/>.
19
* along with this program. If not, see
20
* <http://www.gnu.org/licenses/>.
22
21
*
23
22
* Contact the authors at <mandos@recompile.se>.
24
23
*/
25
24
26
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
27
O_CLOEXEC, pipe2() */
26
O_CLOEXEC */
28
27
#include <stddef.h> /* size_t, NULL */
29
#include <stdlib.h> /* malloc(), reallocarray(), realloc(),
30
EXIT_SUCCESS, exit() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
realloc() */
31
30
#include <stdbool.h> /* bool, true, false */
32
31
#include <stdio.h> /* fileno(), fprintf(),
33
32
stderr, STDOUT_FILENO, fclose() */
34
#include <sys/types.h> /* fstat(), struct stat, waitpid(),
35
WIFEXITED(), WEXITSTATUS(), wait(),
36
pid_t, uid_t, gid_t, getuid(),
37
getgid() */
33
#include <sys/types.h> /* DIR, fdopendir(), fstat(), struct
34
stat, waitpid(), WIFEXITED(),
35
WEXITSTATUS(), wait(), pid_t,
36
uid_t, gid_t, getuid(), getgid(),
37
dirfd() */
38
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
39
FD_SET(), FD_ISSET(), FD_CLR */
40
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS(), WTERMSIG() */
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
42
43
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
43
44
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* struct dirent, scandirat() */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
46
readdir(), closedir(), dirfd() */
45
47
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
46
48
FD_CLOEXEC, write(), STDOUT_FILENO,
47
49
struct stat, fstat(), close(),
48
50
setgid(), setuid(), S_ISREG(),
49
faccessat() pipe2(), fork(),
51
faccessat() pipe(), fork(),
50
52
_exit(), dup2(), fexecve(), read()
51
53
*/
52
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
53
FD_CLOEXEC, openat(), scandirat(),
54
pipe2() */
55
FD_CLOEXEC, openat() */
55
56
#include <string.h> /* strsep, strlen(), strsignal(),
56
57
strcmp(), strncmp() */
57
58
#include <errno.h> /* errno */
76
77
#define BUFFER_SIZE 256
77
78
78
79
#define PDIR "/lib/mandos/plugins.d"
79
#define PHDIR "/lib/mandos/plugin-helpers"
80
80
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
81
81
82
82
const char *argp_program_version = "plugin-runner " VERSION;
179
179
/* Resize the pointed-to array to hold one more pointer */
180
180
char **new_array = NULL;
181
181
do {
182
#if defined(__GLIBC_PREREQ) and __GLIBC_PREREQ(2, 26)
183
new_array = reallocarray(*array, (size_t)((*len) + 2),
184
sizeof(char *));
185
#else
186
if(((size_t)((*len) + 2)) > (SIZE_MAX / sizeof(char *))){
187
/* overflow */
188
new_array = NULL;
189
errno = ENOMEM;
190
} else {
191
new_array = realloc(*array, (size_t)((*len) + 2)
192
* sizeof(char *));
193
}
194
#endif
182
new_array = realloc(*array, sizeof(char *)
183
* (size_t) ((*len) + 2));
195
184
} while(new_array == NULL and errno == EINTR);
196
185
/* Malloc check */
197
186
if(new_array == NULL){
252
241
return add_to_char_array(def, &(p->environ), &(p->envc));
253
242
}
254
243
255
#ifndef O_CLOEXEC
256
244
/*
257
245
* Based on the example in the GNU LibC manual chapter 13.13 "File
258
246
* Descriptor Flags".
269
257
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
270
258
ret | FD_CLOEXEC));
271
259
}
272
#endif /* not O_CLOEXEC */
273
260
274
261
275
262
/* Mark processes as completed when they exit, and save their exit
324
311
__attribute__((nonnull))
325
312
static void free_plugin(plugin *plugin_node){
326
313
327
for(char **arg = (plugin_node->argv)+1; *arg != NULL; arg++){
314
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
328
315
free(*arg);
329
316
}
330
free(plugin_node->name);
331
317
free(plugin_node->argv);
332
318
for(char **env = plugin_node->environ; *env != NULL; env++){
333
319
free(*env);
360
346
361
347
int main(int argc, char *argv[]){
362
348
char *plugindir = NULL;
363
char *pluginhelperdir = NULL;
364
349
char *argfile = NULL;
365
350
FILE *conffp;
366
struct dirent **direntries = NULL;
351
DIR *dir = NULL;
352
struct dirent *dirst;
367
353
struct stat st;
368
354
fd_set rfds_all;
369
355
int ret, maxfd = 0;
377
363
.sa_flags = SA_NOCLDSTOP };
378
364
char **custom_argv = NULL;
379
365
int custom_argc = 0;
380
int dir_fd = -1;
366
int dir_fd;
381
367
382
368
/* Establish a signal handler */
383
369
sigemptyset(&sigchld_action.sa_mask);
428
414
.doc = "Group ID the plugins will run as", .group = 3 },
429
415
{ .name = "debug", .key = 132,
430
416
.doc = "Debug mode", .group = 4 },
431
{ .name = "plugin-helper-dir", .key = 133,
432
.arg = "DIRECTORY",
433
.doc = "Specify a different plugin helper directory",
434
.group = 2 },
435
417
/*
436
418
* These reproduce what we would get without ARGP_NO_HELP
437
419
*/
563
545
case 132: /* --debug */
564
546
debug = true;
565
547
break;
566
case 133: /* --plugin-helper-dir */
567
free(pluginhelperdir);
568
pluginhelperdir = strdup(arg);
569
if(pluginhelperdir != NULL){
570
errno = 0;
571
}
572
break;
573
548
/*
574
549
* These reproduce what we would get without ARGP_NO_HELP
575
550
*/
576
551
case '?': /* --help */
577
552
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
578
553
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
579
__builtin_unreachable();
580
554
case -3: /* --usage */
581
555
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
582
556
argp_state_help(state, state->out_stream,
583
557
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
584
__builtin_unreachable();
585
558
case 'V': /* --version */
586
559
fprintf(state->out_stream, "%s\n", argp_program_version);
587
560
exit(EXIT_SUCCESS);
597
570
if(arg[0] == '\0'){
598
571
break;
599
572
}
600
#if __GNUC__ >= 7
601
__attribute__((fallthrough));
602
#else
603
/* FALLTHROUGH */
604
#endif
605
573
default:
606
574
return ARGP_ERR_UNKNOWN;
607
575
}
633
601
case 130: /* --userid */
634
602
case 131: /* --groupid */
635
603
case 132: /* --debug */
636
case 133: /* --plugin-helper-dir */
637
604
case '?': /* --help */
638
605
case -3: /* --usage */
639
606
case 'V': /* --version */
719
686
720
687
custom_argc += 1;
721
688
{
722
#if defined(__GLIBC_PREREQ) and __GLIBC_PREREQ(2, 26)
723
char **new_argv = reallocarray(custom_argv, (size_t)custom_argc + 1,
724
sizeof(char *));
725
#else
726
char **new_argv = NULL;
727
if(((size_t)custom_argc + 1) > (SIZE_MAX / sizeof(char *))){
728
/* overflow */
729
errno = ENOMEM;
730
} else {
731
new_argv = realloc(custom_argv, ((size_t)custom_argc + 1)
732
* sizeof(char *));
733
}
734
#endif
689
char **new_argv = realloc(custom_argv, sizeof(char *)
690
* ((unsigned int)
691
custom_argc + 1));
735
692
if(new_argv == NULL){
736
error(0, errno, "reallocarray");
693
error(0, errno, "realloc");
737
694
exitstatus = EX_OSERR;
738
695
free(new_arg);
739
696
free(org_line);
804
761
goto fallback;
805
762
}
806
763
807
{
808
char *pluginhelperenv;
809
bool bret = true;
810
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
811
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
812
if(ret != -1){
813
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
814
}
815
if(ret == -1 or not bret){
816
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
817
" environment variable to \"%s\" for all plugins\n",
818
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
819
}
820
if(ret != -1){
821
free(pluginhelperenv);
822
}
823
}
824
825
764
if(debug){
826
for(plugin *p = plugin_list; p != NULL; p = p->next){
765
for(plugin *p = plugin_list; p != NULL; p=p->next){
827
766
fprintf(stderr, "Plugin: %s has %d arguments\n",
828
767
p->name ? p->name : "Global", p->argc - 1);
829
768
for(char **a = p->argv; *a != NULL; a++){
838
777
839
778
if(getuid() == 0){
840
779
/* Work around Debian bug #633582:
841
<https://bugs.debian.org/633582> */
780
<http://bugs.debian.org/633582> */
842
781
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
843
782
if(plugindir_fd == -1){
844
783
if(errno != ENOENT){
856
795
}
857
796
}
858
797
}
859
close(plugindir_fd);
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
860
799
}
861
800
}
862
801
890
829
ret = set_cloexec_flag(dir_fd);
891
830
if(ret < 0){
892
831
error(0, errno, "set_cloexec_flag");
832
TEMP_FAILURE_RETRY(close(dir_fd));
893
833
exitstatus = EX_OSERR;
894
834
goto fallback;
895
835
}
896
836
#endif /* O_CLOEXEC */
837
838
dir = fdopendir(dir_fd);
839
if(dir == NULL){
840
error(0, errno, "Could not open plugin dir");
841
TEMP_FAILURE_RETRY(close(dir_fd));
842
exitstatus = EX_OSERR;
843
goto fallback;
844
}
897
845
}
898
846
899
int good_name(const struct dirent * const dirent){
900
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
901
"*.dpkg-old", "*.dpkg-bak",
902
"*.dpkg-divert", NULL };
847
FD_ZERO(&rfds_all);
848
849
/* Read and execute any executable in the plugin directory*/
850
while(true){
851
do {
852
dirst = readdir(dir);
853
} while(dirst == NULL and errno == EINTR);
854
855
/* All directory entries have been processed */
856
if(dirst == NULL){
857
if(errno == EBADF){
858
error(0, errno, "readdir");
859
exitstatus = EX_IOERR;
860
goto fallback;
861
}
862
break;
863
}
864
865
/* Ignore dotfiles, backup files and other junk */
866
{
867
bool bad_name = false;
868
const char * const patterns[] = { ".*", "#*#", "*~",
869
"*.dpkg-new", "*.dpkg-old",
870
"*.dpkg-bak", "*.dpkg-divert",
871
NULL };
903
872
#ifdef __GNUC__
904
873
#pragma GCC diagnostic push
905
874
#pragma GCC diagnostic ignored "-Wcast-qual"
906
875
#endif
907
for(const char **pat = (const char **)patterns;
908
*pat != NULL; pat++){
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
909
878
#ifdef __GNUC__
910
879
#pragma GCC diagnostic pop
911
880
#endif
912
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
913
!= FNM_NOMATCH){
914
if(debug){
881
if(fnmatch(*pat, dirst->d_name,
882
FNM_FILE_NAME | FNM_PERIOD) != FNM_NOMATCH){
883
if(debug){
915
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
916
" matching pattern %s\n", dirent->d_name, *pat);
885
" matching pattern %s\n", dirst->d_name, *pat);
886
}
887
bad_name = true;
888
break;
917
889
}
918
return 0;
890
}
891
if(bad_name){
892
continue;
919
893
}
920
894
}
921
return 1;
922
}
923
924
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
925
alphasort);
926
if(numplugins == -1){
927
error(0, errno, "Could not scan plugin dir");
928
direntries = NULL;
929
exitstatus = EX_OSERR;
930
goto fallback;
931
}
932
933
FD_ZERO(&rfds_all);
934
935
/* Read and execute any executable in the plugin directory*/
936
for(int i = 0; i < numplugins; i++){
937
895
938
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
896
int plugin_fd = openat(dir_fd, dirst->d_name, O_RDONLY |
897
#ifdef O_CLOEXEC
898
O_CLOEXEC
899
#else /* not O_CLOEXEC */
900
0
901
#endif /* not O_CLOEXEC */
902
);
939
903
if(plugin_fd == -1){
940
904
error(0, errno, "Could not open plugin");
941
free(direntries[i]);
942
continue;
943
}
905
continue;
906
}
907
#ifndef O_CLOEXEC
908
/* Set the FD_CLOEXEC flag on the plugin FD */
909
ret = set_cloexec_flag(plugin_fd);
910
if(ret < 0){
911
error(0, errno, "set_cloexec_flag");
912
TEMP_FAILURE_RETRY(close(plugin_fd));
913
continue;
914
}
915
#endif /* O_CLOEXEC */
944
916
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
945
917
if(ret == -1){
946
918
error(0, errno, "stat");
947
close(plugin_fd);
948
free(direntries[i]);
919
TEMP_FAILURE_RETRY(close(plugin_fd));
949
920
continue;
950
921
}
951
922
952
923
/* Ignore non-executable files */
953
924
if(not S_ISREG(st.st_mode)
954
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
955
X_OK, 0)) != 0)){
925
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, dirst->d_name, X_OK,
926
0)) != 0)){
956
927
if(debug){
957
928
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
958
929
" with bad type or mode\n",
959
plugindir != NULL ? plugindir : PDIR,
960
direntries[i]->d_name);
930
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
961
931
}
962
close(plugin_fd);
963
free(direntries[i]);
932
TEMP_FAILURE_RETRY(close(plugin_fd));
964
933
continue;
965
934
}
966
935
967
plugin *p = getplugin(direntries[i]->d_name);
936
plugin *p = getplugin(dirst->d_name);
968
937
if(p == NULL){
969
938
error(0, errno, "getplugin");
970
close(plugin_fd);
971
free(direntries[i]);
939
TEMP_FAILURE_RETRY(close(plugin_fd));
972
940
continue;
973
941
}
974
942
if(p->disabled){
975
943
if(debug){
976
944
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
977
direntries[i]->d_name);
945
dirst->d_name);
978
946
}
979
close(plugin_fd);
980
free(direntries[i]);
947
TEMP_FAILURE_RETRY(close(plugin_fd));
981
948
continue;
982
949
}
983
950
{
1008
975
}
1009
976
1010
977
int pipefd[2];
1011
#ifndef O_CLOEXEC
1012
978
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
1013
#else /* O_CLOEXEC */
1014
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
1015
#endif /* O_CLOEXEC */
1016
979
if(ret == -1){
1017
980
error(0, errno, "pipe");
1018
981
exitstatus = EX_OSERR;
1019
free(direntries[i]);
1020
goto fallback;
1021
}
1022
if(pipefd[0] >= FD_SETSIZE){
1023
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
1024
FD_SETSIZE);
1025
close(pipefd[0]);
1026
close(pipefd[1]);
1027
exitstatus = EX_OSERR;
1028
free(direntries[i]);
1029
goto fallback;
1030
}
1031
#ifndef O_CLOEXEC
982
goto fallback;
983
}
1032
984
/* Ask OS to automatic close the pipe on exec */
1033
985
ret = set_cloexec_flag(pipefd[0]);
1034
986
if(ret < 0){
1035
987
error(0, errno, "set_cloexec_flag");
1036
close(pipefd[0]);
1037
close(pipefd[1]);
1038
988
exitstatus = EX_OSERR;
1039
free(direntries[i]);
1040
989
goto fallback;
1041
990
}
1042
991
ret = set_cloexec_flag(pipefd[1]);
1043
992
if(ret < 0){
1044
993
error(0, errno, "set_cloexec_flag");
1045
close(pipefd[0]);
1046
close(pipefd[1]);
1047
994
exitstatus = EX_OSERR;
1048
free(direntries[i]);
1049
995
goto fallback;
1050
996
}
1051
#endif /* not O_CLOEXEC */
1052
997
/* Block SIGCHLD until process is safely in process list */
1053
998
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1054
999
&sigchld_action.sa_mask,
1056
1001
if(ret < 0){
1057
1002
error(0, errno, "sigprocmask");
1058
1003
exitstatus = EX_OSERR;
1059
free(direntries[i]);
1060
1004
goto fallback;
1061
1005
}
1062
1006
/* Starting a new process to be watched */
1066
1010
} while(pid == -1 and errno == EINTR);
1067
1011
if(pid == -1){
1068
1012
error(0, errno, "fork");
1069
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1070
&sigchld_action.sa_mask, NULL));
1071
close(pipefd[0]);
1072
close(pipefd[1]);
1073
1013
exitstatus = EX_OSERR;
1074
free(direntries[i]);
1075
1014
goto fallback;
1076
1015
}
1077
1016
if(pid == 0){
1093
1032
_exit(EX_OSERR);
1094
1033
}
1095
1034
1035
if(dirfd(dir) < 0){
1036
/* If dir has no file descriptor, we could not set FD_CLOEXEC
1037
above and must now close it manually here. */
1038
closedir(dir);
1039
}
1096
1040
if(fexecve(plugin_fd, p->argv,
1097
1041
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1098
1042
error(0, errno, "fexecve for %s/%s",
1099
plugindir != NULL ? plugindir : PDIR,
1100
direntries[i]->d_name);
1043
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
1101
1044
_exit(EX_OSERR);
1102
1045
}
1103
1046
/* no return */
1104
1047
}
1105
1048
/* Parent process */
1106
close(pipefd[1]); /* Close unused write end of pipe */
1107
close(plugin_fd);
1108
plugin *new_plugin = getplugin(direntries[i]->d_name);
1049
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1050
pipe */
1051
TEMP_FAILURE_RETRY(close(plugin_fd));
1052
plugin *new_plugin = getplugin(dirst->d_name);
1109
1053
if(new_plugin == NULL){
1110
1054
error(0, errno, "getplugin");
1111
1055
ret = (int)(TEMP_FAILURE_RETRY
1115
1059
error(0, errno, "sigprocmask");
1116
1060
}
1117
1061
exitstatus = EX_OSERR;
1118
free(direntries[i]);
1119
1062
goto fallback;
1120
1063
}
1121
free(direntries[i]);
1122
1064
1123
1065
new_plugin->pid = pid;
1124
1066
new_plugin->fd = pipefd[0];
1125
1126
if(debug){
1127
fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
1128
new_plugin->name, (intmax_t) (new_plugin->pid));
1129
}
1130
1067
1131
1068
/* Unblock SIGCHLD so signal handler can be run if this process
1132
1069
has already completed */
1133
1070
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1139
1076
goto fallback;
1140
1077
}
1141
1078
1142
FD_SET(new_plugin->fd, &rfds_all);
1079
#if defined (__GNUC__) and defined (__GLIBC__)
1080
#if not __GLIBC_PREREQ(2, 16)
1081
#pragma GCC diagnostic push
1082
#pragma GCC diagnostic ignored "-Wsign-conversion"
1083
#endif
1084
#endif
1085
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1086
-Wconversion in GNU libc
1087
before 2.16 */
1088
#if defined (__GNUC__) and defined (__GLIBC__)
1089
#if not __GLIBC_PREREQ(2, 16)
1090
#pragma GCC diagnostic pop
1091
#endif
1092
#endif
1143
1093
1144
1094
if(maxfd < new_plugin->fd){
1145
1095
maxfd = new_plugin->fd;
1146
1096
}
1147
1097
}
1148
1098
1149
free(direntries);
1150
direntries = NULL;
1151
close(dir_fd);
1152
dir_fd = -1;
1099
TEMP_FAILURE_RETRY(closedir(dir));
1100
dir = NULL;
1153
1101
free_plugin(getplugin(NULL));
1154
1102
1155
1103
for(plugin *p = plugin_list; p != NULL; p = p->next){
1194
1142
(intmax_t) (proc->pid),
1195
1143
WTERMSIG(proc->status),
1196
1144
strsignal(WTERMSIG(proc->status)));
1145
} else if(WCOREDUMP(proc->status)){
1146
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1147
" core\n", proc->name, (intmax_t) (proc->pid));
1197
1148
}
1198
1149
}
1199
1150
1200
1151
/* Remove the plugin */
1201
FD_CLR(proc->fd, &rfds_all);
1152
#if defined (__GNUC__) and defined (__GLIBC__)
1153
#if not __GLIBC_PREREQ(2, 16)
1154
#pragma GCC diagnostic push
1155
#pragma GCC diagnostic ignored "-Wsign-conversion"
1156
#endif
1157
#endif
1158
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1159
-Wconversion in GNU libc
1160
before 2.16 */
1161
#if defined (__GNUC__) and defined (__GLIBC__)
1162
#if not __GLIBC_PREREQ(2, 16)
1163
#pragma GCC diagnostic pop
1164
#endif
1165
#endif
1202
1166
1203
1167
/* Block signal while modifying process_list */
1204
1168
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1244
1208
}
1245
1209
1246
1210
/* This process has not completed. Does it have any output? */
1247
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1211
#if defined (__GNUC__) and defined (__GLIBC__)
1212
#if not __GLIBC_PREREQ(2, 16)
1213
#pragma GCC diagnostic push
1214
#pragma GCC diagnostic ignored "-Wsign-conversion"
1215
#endif
1216
#endif
1217
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1218
warning from
1219
-Wconversion
1220
in GNU libc
1221
before
1222
2.16 */
1223
#if defined (__GNUC__) and defined (__GLIBC__)
1224
#if not __GLIBC_PREREQ(2, 16)
1225
#pragma GCC diagnostic pop
1226
#endif
1227
#endif
1248
1228
/* This process had nothing to say at this time */
1249
1229
proc = proc->next;
1250
1230
continue;
1317
1297
free(custom_argv);
1318
1298
}
1319
1299
1320
free(direntries);
1321
1322
if(dir_fd != -1){
1323
close(dir_fd);
1300
if(dir != NULL){
1301
closedir(dir);
1324
1302
}
1325
1303
1326
1304
/* Kill the processes */
1346
1324
free_plugin_list();
1347
1325
1348
1326
free(plugindir);
1349
free(pluginhelperdir);
1350
1327
free(argfile);
1351
1328
1352
1329
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0