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 432
- compare with another revision
- download diff
- download tarball
- view history from revision 432
- Committer: teddy at bsnet
- Date: 2010-09-15 17:21:04 UTC
- Revision ID: teddy@fukt.bsnet.se-20100915172104-eopud55s7dc6vkfj
* plugins.d/usplash.c (main): BUG FIX: allocate space for the final
NULL in cmdline_argv.
NULL in cmdline_argv.
- files removed:
- debian/mandos-client.examples
- debian/source
- debian/upstream
- network-hooks.d
- files modified:
- .bzrignore
added
removed
plugin-runner.c
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008-2014 Teddy Hogeborn
6
* Copyright © 2008-2014 Björn Påhlsson
5
* Copyright © 2008,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 Björn Påhlsson
7
7
*
8
8
* This program is free software: you can redistribute it and/or
9
9
* modify it under the terms of the GNU General Public License as
19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
21
21
*
22
* Contact the authors at <mandos@recompile.se>.
22
* Contact the authors at <mandos@fukt.bsnet.se>.
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
O_CLOEXEC */
26
asprintf(), O_CLOEXEC */
27
27
#include <stddef.h> /* size_t, NULL */
28
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
29
realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO, fclose() */
33
#include <sys/types.h> /* DIR, fdopendir(), fstat(), struct
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
35
35
WEXITSTATUS(), wait(), pid_t,
36
36
uid_t, gid_t, getuid(), getgid(),
40
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
41
WEXITSTATUS(), WTERMSIG(),
42
42
WCOREDUMP() */
43
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
44
44
#include <iso646.h> /* and, or, not */
45
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
46
46
readdir(), closedir(), dirfd() */
47
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
48
FD_CLOEXEC, write(), STDOUT_FILENO,
49
struct stat, fstat(), close(),
50
setgid(), setuid(), S_ISREG(),
51
faccessat() pipe(), fork(),
52
_exit(), dup2(), fexecve(), read()
53
*/
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
fcntl(), setuid(), setgid(),
49
F_GETFD, F_SETFD, FD_CLOEXEC,
50
access(), pipe(), fork(), close()
51
dup2(), STDOUT_FILENO, _exit(),
52
execv(), write(), read(),
53
close() */
54
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
FD_CLOEXEC, openat() */
56
#include <string.h> /* strsep, strlen(), strsignal(),
57
strcmp(), strncmp() */
55
FD_CLOEXEC */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), strcmp(), strncmp() */
58
58
#include <errno.h> /* errno */
59
59
#include <argp.h> /* struct argp_option, struct
60
60
argp_state, struct argp,
72
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
73
73
#include <errno.h> /* errno */
74
74
#include <error.h> /* error() */
75
#include <fnmatch.h> /* fnmatch() */
76
75
77
76
#define BUFFER_SIZE 256
78
77
80
79
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
81
80
82
81
const char *argp_program_version = "plugin-runner " VERSION;
83
const char *argp_program_bug_address = "<mandos@recompile.se>";
82
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
84
83
85
84
typedef struct plugin{
86
85
char *name; /* can be NULL or any plugin name */
106
105
107
106
/* Gets an existing plugin based on name,
108
107
or if none is found, creates a new one */
109
__attribute__((warn_unused_result))
110
108
static plugin *getplugin(char *name){
111
109
/* Check for existing plugin with that name */
112
110
for(plugin *p = plugin_list; p != NULL; p = p->next){
173
171
}
174
172
175
173
/* Helper function for add_argument and add_environment */
176
__attribute__((nonnull, warn_unused_result))
177
174
static bool add_to_char_array(const char *new, char ***array,
178
175
int *len){
179
176
/* Resize the pointed-to array to hold one more pointer */
180
char **new_array = NULL;
181
177
do {
182
new_array = realloc(*array, sizeof(char *)
183
* (size_t) ((*len) + 2));
184
} while(new_array == NULL and errno == EINTR);
178
*array = realloc(*array, sizeof(char *)
179
* (size_t) ((*len) + 2));
180
} while(*array == NULL and errno == EINTR);
185
181
/* Malloc check */
186
if(new_array == NULL){
182
if(*array == NULL){
187
183
return false;
188
184
}
189
*array = new_array;
190
185
/* Make a copy of the new string */
191
186
char *copy;
192
187
do {
204
199
}
205
200
206
201
/* Add to a plugin's argument vector */
207
__attribute__((nonnull(2), warn_unused_result))
208
202
static bool add_argument(plugin *p, const char *arg){
209
203
if(p == NULL){
210
204
return false;
213
207
}
214
208
215
209
/* Add to a plugin's environment */
216
__attribute__((nonnull(2), warn_unused_result))
217
210
static bool add_environment(plugin *p, const char *def, bool replace){
218
211
if(p == NULL){
219
212
return false;
221
214
/* namelen = length of name of environment variable */
222
215
size_t namelen = (size_t)(strchrnul(def, '=') - def);
223
216
/* Search for this environment variable */
224
for(char **envdef = p->environ; *envdef != NULL; envdef++){
225
if(strncmp(*envdef, def, namelen + 1) == 0){
217
for(char **e = p->environ; *e != NULL; e++){
218
if(strncmp(*e, def, namelen + 1) == 0){
226
219
/* It already exists */
227
220
if(replace){
228
char *new_envdef;
221
char *new;
229
222
do {
230
new_envdef = realloc(*envdef, strlen(def) + 1);
231
} while(new_envdef == NULL and errno == EINTR);
232
if(new_envdef == NULL){
223
new = realloc(*e, strlen(def) + 1);
224
} while(new == NULL and errno == EINTR);
225
if(new == NULL){
233
226
return false;
234
227
}
235
*envdef = new_envdef;
236
strcpy(*envdef, def);
228
*e = new;
229
strcpy(*e, def);
237
230
}
238
231
return true;
239
232
}
246
239
* Descriptor Flags".
247
240
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
248
241
*/
249
__attribute__((warn_unused_result))
250
242
static int set_cloexec_flag(int fd){
251
243
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
252
244
/* If reading the flags failed, return error indication now. */
294
286
}
295
287
296
288
/* Prints out a password to stdout */
297
__attribute__((nonnull, warn_unused_result))
298
289
static bool print_out_password(const char *buffer, size_t length){
299
290
ssize_t ret;
300
291
for(size_t written = 0; written < length; written += (size_t)ret){
308
299
}
309
300
310
301
/* Removes and free a plugin from the plugin list */
311
__attribute__((nonnull))
312
302
static void free_plugin(plugin *plugin_node){
313
303
314
304
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
348
338
char *plugindir = NULL;
349
339
char *argfile = NULL;
350
340
FILE *conffp;
341
size_t d_name_len;
351
342
DIR *dir = NULL;
352
343
struct dirent *dirst;
353
344
struct stat st;
363
354
.sa_flags = SA_NOCLDSTOP };
364
355
char **custom_argv = NULL;
365
356
int custom_argc = 0;
366
int dir_fd;
367
357
368
358
/* Establish a signal handler */
369
359
sigemptyset(&sigchld_action.sa_mask);
426
416
{ .name = NULL }
427
417
};
428
418
429
__attribute__((nonnull(3)))
430
419
error_t parse_opt(int key, char *arg, struct argp_state *state){
431
420
errno = 0;
432
421
switch(key){
433
422
char *tmp;
434
intmax_t tmp_id;
423
intmax_t tmpmax;
435
424
case 'g': /* --global-options */
436
425
{
437
426
char *plugin_option;
440
429
break;
441
430
}
442
431
}
443
errno = 0;
444
432
}
445
433
break;
446
434
case 'G': /* --global-env */
447
if(add_environment(getplugin(NULL), arg, true)){
448
errno = 0;
449
}
435
add_environment(getplugin(NULL), arg, true);
450
436
break;
451
437
case 'o': /* --options-for */
452
438
{
469
455
break;
470
456
}
471
457
}
472
errno = 0;
473
458
}
474
459
break;
475
460
case 'E': /* --env-for */
487
472
errno = EINVAL;
488
473
break;
489
474
}
490
if(add_environment(getplugin(arg), envdef, true)){
491
errno = 0;
492
}
475
add_environment(getplugin(arg), envdef, true);
493
476
}
494
477
break;
495
478
case 'd': /* --disable */
497
480
plugin *p = getplugin(arg);
498
481
if(p != NULL){
499
482
p->disabled = true;
500
errno = 0;
501
483
}
502
484
}
503
485
break;
506
488
plugin *p = getplugin(arg);
507
489
if(p != NULL){
508
490
p->disabled = false;
509
errno = 0;
510
491
}
511
492
}
512
493
break;
513
494
case 128: /* --plugin-dir */
514
495
free(plugindir);
515
496
plugindir = strdup(arg);
516
if(plugindir != NULL){
517
errno = 0;
518
}
519
497
break;
520
498
case 129: /* --config-file */
521
499
/* This is already done by parse_opt_config_file() */
522
500
break;
523
501
case 130: /* --userid */
524
tmp_id = strtoimax(arg, &tmp, 10);
502
tmpmax = strtoimax(arg, &tmp, 10);
525
503
if(errno != 0 or tmp == arg or *tmp != '\0'
526
or tmp_id != (uid_t)tmp_id){
504
or tmpmax != (uid_t)tmpmax){
527
505
argp_error(state, "Bad user ID number: \"%s\", using %"
528
506
PRIdMAX, arg, (intmax_t)uid);
529
507
break;
530
508
}
531
uid = (uid_t)tmp_id;
532
errno = 0;
509
uid = (uid_t)tmpmax;
533
510
break;
534
511
case 131: /* --groupid */
535
tmp_id = strtoimax(arg, &tmp, 10);
512
tmpmax = strtoimax(arg, &tmp, 10);
536
513
if(errno != 0 or tmp == arg or *tmp != '\0'
537
or tmp_id != (gid_t)tmp_id){
514
or tmpmax != (gid_t)tmpmax){
538
515
argp_error(state, "Bad group ID number: \"%s\", using %"
539
516
PRIdMAX, arg, (intmax_t)gid);
540
517
break;
541
518
}
542
gid = (gid_t)tmp_id;
543
errno = 0;
519
gid = (gid_t)tmpmax;
544
520
break;
545
521
case 132: /* --debug */
546
522
debug = true;
594
570
case 129: /* --config-file */
595
571
free(argfile);
596
572
argfile = strdup(arg);
597
if(argfile != NULL){
598
errno = 0;
599
}
600
573
break;
601
574
case 130: /* --userid */
602
575
case 131: /* --groupid */
685
658
}
686
659
687
660
custom_argc += 1;
688
{
689
char **new_argv = realloc(custom_argv, sizeof(char *)
690
* ((unsigned int)
691
custom_argc + 1));
692
if(new_argv == NULL){
693
error(0, errno, "realloc");
694
exitstatus = EX_OSERR;
695
free(new_arg);
696
free(org_line);
697
goto fallback;
698
} else {
699
custom_argv = new_argv;
700
}
661
custom_argv = realloc(custom_argv, sizeof(char *)
662
* ((unsigned int) custom_argc + 1));
663
if(custom_argv == NULL){
664
error(0, errno, "realloc");
665
exitstatus = EX_OSERR;
666
free(org_line);
667
goto fallback;
701
668
}
702
669
custom_argv[custom_argc-1] = new_arg;
703
670
custom_argv[custom_argc] = NULL;
775
742
}
776
743
}
777
744
778
if(getuid() == 0){
779
/* Work around Debian bug #633582:
780
<http://bugs.debian.org/633582> */
781
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
782
if(plugindir_fd == -1){
783
if(errno != ENOENT){
784
error(0, errno, "open(\"" PDIR "\")");
785
}
786
} else {
787
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
788
if(ret == -1){
789
error(0, errno, "fstat");
790
} else {
791
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
792
ret = fchown(plugindir_fd, uid, gid);
793
if(ret == -1){
794
error(0, errno, "fchown");
795
}
796
}
797
}
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
799
}
800
}
801
802
/* Lower permissions */
803
ret = setgid(gid);
745
/* Strip permissions down to nobody */
746
setgid(gid);
804
747
if(ret == -1){
805
748
error(0, errno, "setgid");
806
749
}
811
754
812
755
/* Open plugin directory with close_on_exec flag */
813
756
{
814
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
815
#ifdef O_CLOEXEC
816
O_CLOEXEC
817
#else /* not O_CLOEXEC */
818
0
819
#endif /* not O_CLOEXEC */
820
);
757
int dir_fd = -1;
758
if(plugindir == NULL){
759
dir_fd = open(PDIR, O_RDONLY |
760
#ifdef O_CLOEXEC
761
O_CLOEXEC
762
#else /* not O_CLOEXEC */
763
0
764
#endif /* not O_CLOEXEC */
765
);
766
} else {
767
dir_fd = open(plugindir, O_RDONLY |
768
#ifdef O_CLOEXEC
769
O_CLOEXEC
770
#else /* not O_CLOEXEC */
771
0
772
#endif /* not O_CLOEXEC */
773
);
774
}
821
775
if(dir_fd == -1){
822
776
error(0, errno, "Could not open plugin dir");
823
777
exitstatus = EX_UNAVAILABLE;
862
816
break;
863
817
}
864
818
819
d_name_len = strlen(dirst->d_name);
820
865
821
/* Ignore dotfiles, backup files and other junk */
866
822
{
867
823
bool bad_name = false;
868
const char * const patterns[] = { ".*", "#*#", "*~",
869
"*.dpkg-new", "*.dpkg-old",
870
"*.dpkg-bak", "*.dpkg-divert",
871
NULL };
872
#ifdef __GNUC__
873
#pragma GCC diagnostic push
874
#pragma GCC diagnostic ignored "-Wcast-qual"
875
#endif
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
878
#ifdef __GNUC__
879
#pragma GCC diagnostic pop
880
#endif
881
if(fnmatch(*pat, dirst->d_name,
882
FNM_FILE_NAME | FNM_PERIOD) != FNM_NOMATCH){
883
if(debug){
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
885
" matching pattern %s\n", dirst->d_name, *pat);
886
}
887
bad_name = true;
888
break;
889
}
890
}
824
825
const char const *bad_prefixes[] = { ".", "#", NULL };
826
827
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
828
".dpkg-old",
829
".dpkg-bak",
830
".dpkg-divert", NULL };
831
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
832
size_t pre_len = strlen(*pre);
833
if((d_name_len >= pre_len)
834
and strncmp((dirst->d_name), *pre, pre_len) == 0){
835
if(debug){
836
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
837
" with bad prefix %s\n", dirst->d_name, *pre);
838
}
839
bad_name = true;
840
break;
841
}
842
}
843
if(bad_name){
844
continue;
845
}
846
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
847
size_t suf_len = strlen(*suf);
848
if((d_name_len >= suf_len)
849
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
850
== 0)){
851
if(debug){
852
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
853
" with bad suffix %s\n", dirst->d_name, *suf);
854
}
855
bad_name = true;
856
break;
857
}
858
}
859
891
860
if(bad_name){
892
861
continue;
893
862
}
894
863
}
895
864
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
);
903
if(plugin_fd == -1){
904
error(0, errno, "Could not open plugin");
905
continue;
865
char *filename;
866
if(plugindir == NULL){
867
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
868
dirst->d_name));
869
} else {
870
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
871
plugindir,
872
dirst->d_name));
906
873
}
907
#ifndef O_CLOEXEC
908
/* Set the FD_CLOEXEC flag on the plugin FD */
909
ret = set_cloexec_flag(plugin_fd);
910
874
if(ret < 0){
911
error(0, errno, "set_cloexec_flag");
912
TEMP_FAILURE_RETRY(close(plugin_fd));
875
error(0, errno, "asprintf");
913
876
continue;
914
877
}
915
#endif /* O_CLOEXEC */
916
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
878
879
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
917
880
if(ret == -1){
918
881
error(0, errno, "stat");
919
TEMP_FAILURE_RETRY(close(plugin_fd));
882
free(filename);
920
883
continue;
921
884
}
922
885
923
886
/* Ignore non-executable files */
924
887
if(not S_ISREG(st.st_mode)
925
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, dirst->d_name, X_OK,
926
0)) != 0)){
888
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
927
889
if(debug){
928
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
929
" with bad type or mode\n",
930
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
890
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
891
" with bad type or mode\n", filename);
931
892
}
932
TEMP_FAILURE_RETRY(close(plugin_fd));
893
free(filename);
933
894
continue;
934
895
}
935
896
936
897
plugin *p = getplugin(dirst->d_name);
937
898
if(p == NULL){
938
899
error(0, errno, "getplugin");
939
TEMP_FAILURE_RETRY(close(plugin_fd));
900
free(filename);
940
901
continue;
941
902
}
942
903
if(p->disabled){
944
905
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
945
906
dirst->d_name);
946
907
}
947
TEMP_FAILURE_RETRY(close(plugin_fd));
908
free(filename);
948
909
continue;
949
910
}
950
911
{
964
925
}
965
926
}
966
927
}
967
/* If this plugin has any environment variables, we need to
968
duplicate the environment from this process, too. */
928
/* If this plugin has any environment variables, we will call
929
using execve and need to duplicate the environment from this
930
process, too. */
969
931
if(p->environ[0] != NULL){
970
932
for(char **e = environ; *e != NULL; e++){
971
933
if(not add_environment(p, *e, false)){
981
943
exitstatus = EX_OSERR;
982
944
goto fallback;
983
945
}
984
if(pipefd[0] >= FD_SETSIZE){
985
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
986
FD_SETSIZE);
987
TEMP_FAILURE_RETRY(close(pipefd[0]));
988
TEMP_FAILURE_RETRY(close(pipefd[1]));
989
exitstatus = EX_OSERR;
990
goto fallback;
991
}
992
946
/* Ask OS to automatic close the pipe on exec */
993
947
ret = set_cloexec_flag(pipefd[0]);
994
948
if(ret < 0){
995
949
error(0, errno, "set_cloexec_flag");
996
TEMP_FAILURE_RETRY(close(pipefd[0]));
997
TEMP_FAILURE_RETRY(close(pipefd[1]));
998
950
exitstatus = EX_OSERR;
999
951
goto fallback;
1000
952
}
1001
953
ret = set_cloexec_flag(pipefd[1]);
1002
954
if(ret < 0){
1003
955
error(0, errno, "set_cloexec_flag");
1004
TEMP_FAILURE_RETRY(close(pipefd[0]));
1005
TEMP_FAILURE_RETRY(close(pipefd[1]));
1006
956
exitstatus = EX_OSERR;
1007
957
goto fallback;
1008
958
}
1022
972
} while(pid == -1 and errno == EINTR);
1023
973
if(pid == -1){
1024
974
error(0, errno, "fork");
1025
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1026
&sigchld_action.sa_mask, NULL));
1027
TEMP_FAILURE_RETRY(close(pipefd[0]));
1028
TEMP_FAILURE_RETRY(close(pipefd[1]));
1029
975
exitstatus = EX_OSERR;
1030
976
goto fallback;
1031
977
}
1053
999
above and must now close it manually here. */
1054
1000
closedir(dir);
1055
1001
}
1056
if(fexecve(plugin_fd, p->argv,
1057
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1058
error(0, errno, "fexecve for %s/%s",
1059
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
1060
_exit(EX_OSERR);
1002
if(p->environ[0] == NULL){
1003
if(execv(filename, p->argv) < 0){
1004
error(0, errno, "execv for %s", filename);
1005
_exit(EX_OSERR);
1006
}
1007
} else {
1008
if(execve(filename, p->argv, p->environ) < 0){
1009
error(0, errno, "execve for %s", filename);
1010
_exit(EX_OSERR);
1011
}
1061
1012
}
1062
1013
/* no return */
1063
1014
}
1064
1015
/* Parent process */
1065
1016
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1066
1017
pipe */
1067
TEMP_FAILURE_RETRY(close(plugin_fd));
1018
free(filename);
1068
1019
plugin *new_plugin = getplugin(dirst->d_name);
1069
1020
if(new_plugin == NULL){
1070
1021
error(0, errno, "getplugin");
1092
1043
goto fallback;
1093
1044
}
1094
1045
1095
#if defined (__GNUC__) and defined (__GLIBC__)
1096
#if not __GLIBC_PREREQ(2, 16)
1097
#pragma GCC diagnostic push
1098
#pragma GCC diagnostic ignored "-Wsign-conversion"
1099
#endif
1100
#endif
1101
1046
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1102
-Wconversion in GNU libc
1103
before 2.16 */
1104
#if defined (__GNUC__) and defined (__GLIBC__)
1105
#if not __GLIBC_PREREQ(2, 16)
1106
#pragma GCC diagnostic pop
1107
#endif
1108
#endif
1047
-Wconversion */
1109
1048
1110
1049
if(maxfd < new_plugin->fd){
1111
1050
maxfd = new_plugin->fd;
1165
1104
}
1166
1105
1167
1106
/* Remove the plugin */
1168
#if defined (__GNUC__) and defined (__GLIBC__)
1169
#if not __GLIBC_PREREQ(2, 16)
1170
#pragma GCC diagnostic push
1171
#pragma GCC diagnostic ignored "-Wsign-conversion"
1172
#endif
1173
#endif
1174
1107
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1175
-Wconversion in GNU libc
1176
before 2.16 */
1177
#if defined (__GNUC__) and defined (__GLIBC__)
1178
#if not __GLIBC_PREREQ(2, 16)
1179
#pragma GCC diagnostic pop
1180
#endif
1181
#endif
1108
-Wconversion */
1182
1109
1183
1110
/* Block signal while modifying process_list */
1184
1111
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1224
1151
}
1225
1152
1226
1153
/* This process has not completed. Does it have any output? */
1227
#if defined (__GNUC__) and defined (__GLIBC__)
1228
#if not __GLIBC_PREREQ(2, 16)
1229
#pragma GCC diagnostic push
1230
#pragma GCC diagnostic ignored "-Wsign-conversion"
1231
#endif
1232
#endif
1233
1154
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1234
1155
warning from
1235
-Wconversion
1236
in GNU libc
1237
before
1238
2.16 */
1239
#if defined (__GNUC__) and defined (__GLIBC__)
1240
#if not __GLIBC_PREREQ(2, 16)
1241
#pragma GCC diagnostic pop
1242
#endif
1243
#endif
1156
-Wconversion */
1244
1157
/* This process had nothing to say at this time */
1245
1158
proc = proc->next;
1246
1159
continue;
1247
1160
}
1248
1161
/* Before reading, make the process' data buffer large enough */
1249
1162
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1250
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1251
+ (size_t) BUFFER_SIZE);
1252
if(new_buffer == NULL){
1163
proc->buffer = realloc(proc->buffer, proc->buffer_size
1164
+ (size_t) BUFFER_SIZE);
1165
if(proc->buffer == NULL){
1253
1166
error(0, errno, "malloc");
1254
1167
exitstatus = EX_OSERR;
1255
1168
goto fallback;
1256
1169
}
1257
proc->buffer = new_buffer;
1258
1170
proc->buffer_size += BUFFER_SIZE;
1259
1171
}
1260
1172
/* Read from the process */
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0