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 312
- compare with another revision
- download diff
- download tarball
- view history from revision 312
- Committer: Teddy Hogeborn
- Date: 2014-05-11 20:18:48 UTC
- Revision ID: teddy@recompile.se-20140511201848-blw9pl5c76upkhdc
Tags: version-1.6.5-1
* Makefile (version): Changed to "1.6.5".
* NEWS (Version 1.6.5): New entry.
* debian/changelog (1.6.5-1): - '' -
* NEWS (Version 1.6.5): New entry.
* debian/changelog (1.6.5-1): - '' -
- files added:
- initramfs-tools-hook-conf
- files removed:
- bugs.xml
- plugin-helpers
- files modified:
- DBUS-API
added
removed
plugin-runner.c
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008-2018 Teddy Hogeborn
6
* Copyright © 2008-2018 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
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
30
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;
241
241
return add_to_char_array(def, &(p->environ), &(p->envc));
242
242
}
243
243
244
#ifndef O_CLOEXEC
245
244
/*
246
245
* Based on the example in the GNU LibC manual chapter 13.13 "File
247
246
* Descriptor Flags".
258
257
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
259
258
ret | FD_CLOEXEC));
260
259
}
261
#endif /* not O_CLOEXEC */
262
260
263
261
264
262
/* Mark processes as completed when they exit, and save their exit
313
311
__attribute__((nonnull))
314
312
static void free_plugin(plugin *plugin_node){
315
313
316
for(char **arg = (plugin_node->argv)+1; *arg != NULL; arg++){
314
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
317
315
free(*arg);
318
316
}
319
free(plugin_node->name);
320
317
free(plugin_node->argv);
321
318
for(char **env = plugin_node->environ; *env != NULL; env++){
322
319
free(*env);
349
346
350
347
int main(int argc, char *argv[]){
351
348
char *plugindir = NULL;
352
char *pluginhelperdir = NULL;
353
349
char *argfile = NULL;
354
350
FILE *conffp;
355
struct dirent **direntries = NULL;
351
DIR *dir = NULL;
352
struct dirent *dirst;
356
353
struct stat st;
357
354
fd_set rfds_all;
358
355
int ret, maxfd = 0;
366
363
.sa_flags = SA_NOCLDSTOP };
367
364
char **custom_argv = NULL;
368
365
int custom_argc = 0;
369
int dir_fd = -1;
366
int dir_fd;
370
367
371
368
/* Establish a signal handler */
372
369
sigemptyset(&sigchld_action.sa_mask);
417
414
.doc = "Group ID the plugins will run as", .group = 3 },
418
415
{ .name = "debug", .key = 132,
419
416
.doc = "Debug mode", .group = 4 },
420
{ .name = "plugin-helper-dir", .key = 133,
421
.arg = "DIRECTORY",
422
.doc = "Specify a different plugin helper directory",
423
.group = 2 },
424
417
/*
425
418
* These reproduce what we would get without ARGP_NO_HELP
426
419
*/
552
545
case 132: /* --debug */
553
546
debug = true;
554
547
break;
555
case 133: /* --plugin-helper-dir */
556
free(pluginhelperdir);
557
pluginhelperdir = strdup(arg);
558
if(pluginhelperdir != NULL){
559
errno = 0;
560
}
561
break;
562
548
/*
563
549
* These reproduce what we would get without ARGP_NO_HELP
564
550
*/
565
551
case '?': /* --help */
566
552
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
567
553
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
568
__builtin_unreachable();
569
554
case -3: /* --usage */
570
555
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
571
556
argp_state_help(state, state->out_stream,
572
557
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
573
__builtin_unreachable();
574
558
case 'V': /* --version */
575
559
fprintf(state->out_stream, "%s\n", argp_program_version);
576
560
exit(EXIT_SUCCESS);
586
570
if(arg[0] == '\0'){
587
571
break;
588
572
}
589
/* FALLTHROUGH */
590
573
default:
591
574
return ARGP_ERR_UNKNOWN;
592
575
}
618
601
case 130: /* --userid */
619
602
case 131: /* --groupid */
620
603
case 132: /* --debug */
621
case 133: /* --plugin-helper-dir */
622
604
case '?': /* --help */
623
605
case -3: /* --usage */
624
606
case 'V': /* --version */
705
687
custom_argc += 1;
706
688
{
707
689
char **new_argv = realloc(custom_argv, sizeof(char *)
708
* ((size_t)custom_argc + 1));
690
* ((unsigned int)
691
custom_argc + 1));
709
692
if(new_argv == NULL){
710
693
error(0, errno, "realloc");
711
694
exitstatus = EX_OSERR;
778
761
goto fallback;
779
762
}
780
763
781
{
782
char *pluginhelperenv;
783
bool bret = true;
784
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
785
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
786
if(ret != -1){
787
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
788
}
789
if(ret == -1 or not bret){
790
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
791
" environment variable to \"%s\" for all plugins\n",
792
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
793
}
794
if(ret != -1){
795
free(pluginhelperenv);
796
}
797
}
798
799
764
if(debug){
800
for(plugin *p = plugin_list; p != NULL; p = p->next){
765
for(plugin *p = plugin_list; p != NULL; p=p->next){
801
766
fprintf(stderr, "Plugin: %s has %d arguments\n",
802
767
p->name ? p->name : "Global", p->argc - 1);
803
768
for(char **a = p->argv; *a != NULL; a++){
812
777
813
778
if(getuid() == 0){
814
779
/* Work around Debian bug #633582:
815
<https://bugs.debian.org/633582> */
780
<http://bugs.debian.org/633582> */
816
781
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
817
782
if(plugindir_fd == -1){
818
783
if(errno != ENOENT){
830
795
}
831
796
}
832
797
}
833
close(plugindir_fd);
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
834
799
}
835
800
}
836
801
864
829
ret = set_cloexec_flag(dir_fd);
865
830
if(ret < 0){
866
831
error(0, errno, "set_cloexec_flag");
832
TEMP_FAILURE_RETRY(close(dir_fd));
867
833
exitstatus = EX_OSERR;
868
834
goto fallback;
869
835
}
870
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
}
871
845
}
872
846
873
int good_name(const struct dirent * const dirent){
874
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
875
"*.dpkg-old", "*.dpkg-bak",
876
"*.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 };
877
872
#ifdef __GNUC__
878
873
#pragma GCC diagnostic push
879
874
#pragma GCC diagnostic ignored "-Wcast-qual"
880
875
#endif
881
for(const char **pat = (const char **)patterns;
882
*pat != NULL; pat++){
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
883
878
#ifdef __GNUC__
884
879
#pragma GCC diagnostic pop
885
880
#endif
886
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
887
!= FNM_NOMATCH){
888
if(debug){
881
if(fnmatch(*pat, dirst->d_name,
882
FNM_FILE_NAME | FNM_PERIOD) != FNM_NOMATCH){
883
if(debug){
889
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
890
" matching pattern %s\n", dirent->d_name, *pat);
885
" matching pattern %s\n", dirst->d_name, *pat);
886
}
887
bad_name = true;
888
break;
891
889
}
892
return 0;
890
}
891
if(bad_name){
892
continue;
893
893
}
894
894
}
895
return 1;
896
}
897
898
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
899
alphasort);
900
if(numplugins == -1){
901
error(0, errno, "Could not scan plugin dir");
902
direntries = NULL;
903
exitstatus = EX_OSERR;
904
goto fallback;
905
}
906
907
FD_ZERO(&rfds_all);
908
909
/* Read and execute any executable in the plugin directory*/
910
for(int i = 0; i < numplugins; i++){
911
895
912
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
);
913
903
if(plugin_fd == -1){
914
904
error(0, errno, "Could not open plugin");
915
free(direntries[i]);
916
continue;
917
}
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 */
918
916
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
919
917
if(ret == -1){
920
918
error(0, errno, "stat");
921
close(plugin_fd);
922
free(direntries[i]);
919
TEMP_FAILURE_RETRY(close(plugin_fd));
923
920
continue;
924
921
}
925
922
926
923
/* Ignore non-executable files */
927
924
if(not S_ISREG(st.st_mode)
928
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
929
X_OK, 0)) != 0)){
925
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, dirst->d_name, X_OK,
926
0)) != 0)){
930
927
if(debug){
931
928
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
932
929
" with bad type or mode\n",
933
plugindir != NULL ? plugindir : PDIR,
934
direntries[i]->d_name);
930
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
935
931
}
936
close(plugin_fd);
937
free(direntries[i]);
932
TEMP_FAILURE_RETRY(close(plugin_fd));
938
933
continue;
939
934
}
940
935
941
plugin *p = getplugin(direntries[i]->d_name);
936
plugin *p = getplugin(dirst->d_name);
942
937
if(p == NULL){
943
938
error(0, errno, "getplugin");
944
close(plugin_fd);
945
free(direntries[i]);
939
TEMP_FAILURE_RETRY(close(plugin_fd));
946
940
continue;
947
941
}
948
942
if(p->disabled){
949
943
if(debug){
950
944
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
951
direntries[i]->d_name);
945
dirst->d_name);
952
946
}
953
close(plugin_fd);
954
free(direntries[i]);
947
TEMP_FAILURE_RETRY(close(plugin_fd));
955
948
continue;
956
949
}
957
950
{
982
975
}
983
976
984
977
int pipefd[2];
985
#ifndef O_CLOEXEC
986
978
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
987
#else /* O_CLOEXEC */
988
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
989
#endif /* O_CLOEXEC */
990
979
if(ret == -1){
991
980
error(0, errno, "pipe");
992
981
exitstatus = EX_OSERR;
993
free(direntries[i]);
994
goto fallback;
995
}
996
if(pipefd[0] >= FD_SETSIZE){
997
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
998
FD_SETSIZE);
999
close(pipefd[0]);
1000
close(pipefd[1]);
1001
exitstatus = EX_OSERR;
1002
free(direntries[i]);
1003
goto fallback;
1004
}
1005
#ifndef O_CLOEXEC
982
goto fallback;
983
}
1006
984
/* Ask OS to automatic close the pipe on exec */
1007
985
ret = set_cloexec_flag(pipefd[0]);
1008
986
if(ret < 0){
1009
987
error(0, errno, "set_cloexec_flag");
1010
close(pipefd[0]);
1011
close(pipefd[1]);
1012
988
exitstatus = EX_OSERR;
1013
free(direntries[i]);
1014
989
goto fallback;
1015
990
}
1016
991
ret = set_cloexec_flag(pipefd[1]);
1017
992
if(ret < 0){
1018
993
error(0, errno, "set_cloexec_flag");
1019
close(pipefd[0]);
1020
close(pipefd[1]);
1021
994
exitstatus = EX_OSERR;
1022
free(direntries[i]);
1023
995
goto fallback;
1024
996
}
1025
#endif /* not O_CLOEXEC */
1026
997
/* Block SIGCHLD until process is safely in process list */
1027
998
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1028
999
&sigchld_action.sa_mask,
1030
1001
if(ret < 0){
1031
1002
error(0, errno, "sigprocmask");
1032
1003
exitstatus = EX_OSERR;
1033
free(direntries[i]);
1034
1004
goto fallback;
1035
1005
}
1036
1006
/* Starting a new process to be watched */
1040
1010
} while(pid == -1 and errno == EINTR);
1041
1011
if(pid == -1){
1042
1012
error(0, errno, "fork");
1043
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1044
&sigchld_action.sa_mask, NULL));
1045
close(pipefd[0]);
1046
close(pipefd[1]);
1047
1013
exitstatus = EX_OSERR;
1048
free(direntries[i]);
1049
1014
goto fallback;
1050
1015
}
1051
1016
if(pid == 0){
1067
1032
_exit(EX_OSERR);
1068
1033
}
1069
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
}
1070
1040
if(fexecve(plugin_fd, p->argv,
1071
1041
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1072
1042
error(0, errno, "fexecve for %s/%s",
1073
plugindir != NULL ? plugindir : PDIR,
1074
direntries[i]->d_name);
1043
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
1075
1044
_exit(EX_OSERR);
1076
1045
}
1077
1046
/* no return */
1078
1047
}
1079
1048
/* Parent process */
1080
close(pipefd[1]); /* Close unused write end of pipe */
1081
close(plugin_fd);
1082
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);
1083
1053
if(new_plugin == NULL){
1084
1054
error(0, errno, "getplugin");
1085
1055
ret = (int)(TEMP_FAILURE_RETRY
1089
1059
error(0, errno, "sigprocmask");
1090
1060
}
1091
1061
exitstatus = EX_OSERR;
1092
free(direntries[i]);
1093
1062
goto fallback;
1094
1063
}
1095
free(direntries[i]);
1096
1064
1097
1065
new_plugin->pid = pid;
1098
1066
new_plugin->fd = pipefd[0];
1099
1100
if(debug){
1101
fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
1102
new_plugin->name, (intmax_t) (new_plugin->pid));
1103
}
1104
1067
1105
1068
/* Unblock SIGCHLD so signal handler can be run if this process
1106
1069
has already completed */
1107
1070
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1113
1076
goto fallback;
1114
1077
}
1115
1078
1116
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
1117
1093
1118
1094
if(maxfd < new_plugin->fd){
1119
1095
maxfd = new_plugin->fd;
1120
1096
}
1121
1097
}
1122
1098
1123
free(direntries);
1124
direntries = NULL;
1125
close(dir_fd);
1126
dir_fd = -1;
1099
TEMP_FAILURE_RETRY(closedir(dir));
1100
dir = NULL;
1127
1101
free_plugin(getplugin(NULL));
1128
1102
1129
1103
for(plugin *p = plugin_list; p != NULL; p = p->next){
1168
1142
(intmax_t) (proc->pid),
1169
1143
WTERMSIG(proc->status),
1170
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));
1171
1148
}
1172
1149
}
1173
1150
1174
1151
/* Remove the plugin */
1175
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
1176
1166
1177
1167
/* Block signal while modifying process_list */
1178
1168
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1218
1208
}
1219
1209
1220
1210
/* This process has not completed. Does it have any output? */
1221
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
1222
1228
/* This process had nothing to say at this time */
1223
1229
proc = proc->next;
1224
1230
continue;
1291
1297
free(custom_argv);
1292
1298
}
1293
1299
1294
free(direntries);
1295
1296
if(dir_fd != -1){
1297
close(dir_fd);
1300
if(dir != NULL){
1301
closedir(dir);
1298
1302
}
1299
1303
1300
1304
/* Kill the processes */
1320
1324
free_plugin_list();
1321
1325
1322
1326
free(plugindir);
1323
free(pluginhelperdir);
1324
1327
free(argfile);
1325
1328
1326
1329
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0