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 418
- compare with another revision
- download diff
- download tarball
- view history from revision 418
- Committer: teddy at bsnet
- Date: 2010-09-08 19:25:13 UTC
- Revision ID: teddy@fukt.bsnet.se-20100908192513-ccso0jpam3qg4yze
* TODO: Clarifications.
- files removed:
- DBUS-API
- debian/source
- 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-2013 Teddy Hogeborn
6
* Copyright © 2008-2013 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(),
28
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
29
realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* fileno(), fprintf(),
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
70
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
72
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
73
#include <errno.h> /* errno */
74
#include <error.h> /* error() */
75
73
76
74
#define BUFFER_SIZE 256
77
75
79
77
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
80
78
81
79
const char *argp_program_version = "plugin-runner " VERSION;
82
const char *argp_program_bug_address = "<mandos@recompile.se>";
80
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
83
81
84
82
typedef struct plugin{
85
83
char *name; /* can be NULL or any plugin name */
105
103
106
104
/* Gets an existing plugin based on name,
107
105
or if none is found, creates a new one */
108
__attribute__((warn_unused_result))
109
106
static plugin *getplugin(char *name){
110
107
/* Check for existing plugin with that name */
111
108
for(plugin *p = plugin_list; p != NULL; p = p->next){
172
169
}
173
170
174
171
/* Helper function for add_argument and add_environment */
175
__attribute__((nonnull, warn_unused_result))
176
172
static bool add_to_char_array(const char *new, char ***array,
177
173
int *len){
178
174
/* Resize the pointed-to array to hold one more pointer */
179
char **new_array = NULL;
180
175
do {
181
new_array = realloc(*array, sizeof(char *)
182
* (size_t) ((*len) + 2));
183
} while(new_array == NULL and errno == EINTR);
176
*array = realloc(*array, sizeof(char *)
177
* (size_t) ((*len) + 2));
178
} while(*array == NULL and errno == EINTR);
184
179
/* Malloc check */
185
if(new_array == NULL){
180
if(*array == NULL){
186
181
return false;
187
182
}
188
*array = new_array;
189
183
/* Make a copy of the new string */
190
184
char *copy;
191
185
do {
203
197
}
204
198
205
199
/* Add to a plugin's argument vector */
206
__attribute__((nonnull(2), warn_unused_result))
207
200
static bool add_argument(plugin *p, const char *arg){
208
201
if(p == NULL){
209
202
return false;
212
205
}
213
206
214
207
/* Add to a plugin's environment */
215
__attribute__((nonnull(2), warn_unused_result))
216
208
static bool add_environment(plugin *p, const char *def, bool replace){
217
209
if(p == NULL){
218
210
return false;
220
212
/* namelen = length of name of environment variable */
221
213
size_t namelen = (size_t)(strchrnul(def, '=') - def);
222
214
/* Search for this environment variable */
223
for(char **envdef = p->environ; *envdef != NULL; envdef++){
224
if(strncmp(*envdef, def, namelen + 1) == 0){
215
for(char **e = p->environ; *e != NULL; e++){
216
if(strncmp(*e, def, namelen + 1) == 0){
225
217
/* It already exists */
226
218
if(replace){
227
char *new_envdef;
219
char *new;
228
220
do {
229
new_envdef = realloc(*envdef, strlen(def) + 1);
230
} while(new_envdef == NULL and errno == EINTR);
231
if(new_envdef == NULL){
221
new = realloc(*e, strlen(def) + 1);
222
} while(new == NULL and errno == EINTR);
223
if(new == NULL){
232
224
return false;
233
225
}
234
*envdef = new_envdef;
235
strcpy(*envdef, def);
226
*e = new;
227
strcpy(*e, def);
236
228
}
237
229
return true;
238
230
}
245
237
* Descriptor Flags".
246
238
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
247
239
*/
248
__attribute__((warn_unused_result))
249
240
static int set_cloexec_flag(int fd){
250
241
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
251
242
/* If reading the flags failed, return error indication now. */
275
266
/* No child processes */
276
267
break;
277
268
}
278
error(0, errno, "waitpid");
269
perror("waitpid");
279
270
}
280
271
281
272
/* A child exited, find it in process_list */
293
284
}
294
285
295
286
/* Prints out a password to stdout */
296
__attribute__((nonnull, warn_unused_result))
297
287
static bool print_out_password(const char *buffer, size_t length){
298
288
ssize_t ret;
299
289
for(size_t written = 0; written < length; written += (size_t)ret){
307
297
}
308
298
309
299
/* Removes and free a plugin from the plugin list */
310
__attribute__((nonnull))
311
300
static void free_plugin(plugin *plugin_node){
312
301
313
302
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
368
357
sigemptyset(&sigchld_action.sa_mask);
369
358
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
370
359
if(ret == -1){
371
error(0, errno, "sigaddset");
360
perror("sigaddset");
372
361
exitstatus = EX_OSERR;
373
362
goto fallback;
374
363
}
375
364
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
376
365
if(ret == -1){
377
error(0, errno, "sigaction");
366
perror("sigaction");
378
367
exitstatus = EX_OSERR;
379
368
goto fallback;
380
369
}
425
414
{ .name = NULL }
426
415
};
427
416
428
__attribute__((nonnull(3)))
429
417
error_t parse_opt(int key, char *arg, struct argp_state *state){
430
418
errno = 0;
431
419
switch(key){
432
420
char *tmp;
433
intmax_t tmp_id;
421
intmax_t tmpmax;
434
422
case 'g': /* --global-options */
435
423
{
436
424
char *plugin_option;
439
427
break;
440
428
}
441
429
}
442
errno = 0;
443
430
}
444
431
break;
445
432
case 'G': /* --global-env */
446
if(add_environment(getplugin(NULL), arg, true)){
447
errno = 0;
448
}
433
add_environment(getplugin(NULL), arg, true);
449
434
break;
450
435
case 'o': /* --options-for */
451
436
{
468
453
break;
469
454
}
470
455
}
471
errno = 0;
472
456
}
473
457
break;
474
458
case 'E': /* --env-for */
486
470
errno = EINVAL;
487
471
break;
488
472
}
489
if(add_environment(getplugin(arg), envdef, true)){
490
errno = 0;
491
}
473
add_environment(getplugin(arg), envdef, true);
492
474
}
493
475
break;
494
476
case 'd': /* --disable */
496
478
plugin *p = getplugin(arg);
497
479
if(p != NULL){
498
480
p->disabled = true;
499
errno = 0;
500
481
}
501
482
}
502
483
break;
505
486
plugin *p = getplugin(arg);
506
487
if(p != NULL){
507
488
p->disabled = false;
508
errno = 0;
509
489
}
510
490
}
511
491
break;
512
492
case 128: /* --plugin-dir */
513
493
free(plugindir);
514
494
plugindir = strdup(arg);
515
if(plugindir != NULL){
516
errno = 0;
517
}
518
495
break;
519
496
case 129: /* --config-file */
520
497
/* This is already done by parse_opt_config_file() */
521
498
break;
522
499
case 130: /* --userid */
523
tmp_id = strtoimax(arg, &tmp, 10);
500
tmpmax = strtoimax(arg, &tmp, 10);
524
501
if(errno != 0 or tmp == arg or *tmp != '\0'
525
or tmp_id != (uid_t)tmp_id){
502
or tmpmax != (uid_t)tmpmax){
526
503
argp_error(state, "Bad user ID number: \"%s\", using %"
527
504
PRIdMAX, arg, (intmax_t)uid);
528
505
break;
529
506
}
530
uid = (uid_t)tmp_id;
531
errno = 0;
507
uid = (uid_t)tmpmax;
532
508
break;
533
509
case 131: /* --groupid */
534
tmp_id = strtoimax(arg, &tmp, 10);
510
tmpmax = strtoimax(arg, &tmp, 10);
535
511
if(errno != 0 or tmp == arg or *tmp != '\0'
536
or tmp_id != (gid_t)tmp_id){
512
or tmpmax != (gid_t)tmpmax){
537
513
argp_error(state, "Bad group ID number: \"%s\", using %"
538
514
PRIdMAX, arg, (intmax_t)gid);
539
515
break;
540
516
}
541
gid = (gid_t)tmp_id;
542
errno = 0;
517
gid = (gid_t)tmpmax;
543
518
break;
544
519
case 132: /* --debug */
545
520
debug = true;
593
568
case 129: /* --config-file */
594
569
free(argfile);
595
570
argfile = strdup(arg);
596
if(argfile != NULL){
597
errno = 0;
598
}
599
571
break;
600
572
case 130: /* --userid */
601
573
case 131: /* --groupid */
627
599
case ENOMEM:
628
600
default:
629
601
errno = ret;
630
error(0, errno, "argp_parse");
602
perror("argp_parse");
631
603
exitstatus = EX_OSERR;
632
604
goto fallback;
633
605
case EINVAL:
654
626
custom_argc = 1;
655
627
custom_argv = malloc(sizeof(char*) * 2);
656
628
if(custom_argv == NULL){
657
error(0, errno, "malloc");
629
perror("malloc");
658
630
exitstatus = EX_OSERR;
659
631
goto fallback;
660
632
}
677
649
}
678
650
new_arg = strdup(p);
679
651
if(new_arg == NULL){
680
error(0, errno, "strdup");
652
perror("strdup");
681
653
exitstatus = EX_OSERR;
682
654
free(org_line);
683
655
goto fallback;
684
656
}
685
657
686
658
custom_argc += 1;
687
{
688
char **new_argv = realloc(custom_argv, sizeof(char *)
689
* ((unsigned int)
690
custom_argc + 1));
691
if(new_argv == NULL){
692
error(0, errno, "realloc");
693
exitstatus = EX_OSERR;
694
free(new_arg);
695
free(org_line);
696
goto fallback;
697
} else {
698
custom_argv = new_argv;
699
}
659
custom_argv = realloc(custom_argv, sizeof(char *)
660
* ((unsigned int) custom_argc + 1));
661
if(custom_argv == NULL){
662
perror("realloc");
663
exitstatus = EX_OSERR;
664
free(org_line);
665
goto fallback;
700
666
}
701
667
custom_argv[custom_argc-1] = new_arg;
702
668
custom_argv[custom_argc] = NULL;
706
672
ret = fclose(conffp);
707
673
} while(ret == EOF and errno == EINTR);
708
674
if(ret == EOF){
709
error(0, errno, "fclose");
675
perror("fclose");
710
676
exitstatus = EX_IOERR;
711
677
goto fallback;
712
678
}
715
681
/* Check for harmful errors and go to fallback. Other errors might
716
682
not affect opening plugins */
717
683
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
718
error(0, errno, "fopen");
684
perror("fopen");
719
685
exitstatus = EX_OSERR;
720
686
goto fallback;
721
687
}
732
698
case ENOMEM:
733
699
default:
734
700
errno = ret;
735
error(0, errno, "argp_parse");
701
perror("argp_parse");
736
702
exitstatus = EX_OSERR;
737
703
goto fallback;
738
704
case EINVAL:
752
718
case ENOMEM:
753
719
default:
754
720
errno = ret;
755
error(0, errno, "argp_parse");
721
perror("argp_parse");
756
722
exitstatus = EX_OSERR;
757
723
goto fallback;
758
724
case EINVAL:
774
740
}
775
741
}
776
742
777
if(getuid() == 0){
778
/* Work around Debian bug #633582:
779
<http://bugs.debian.org/633582> */
780
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
781
if(plugindir_fd == -1){
782
error(0, errno, "open");
783
} else {
784
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
785
if(ret == -1){
786
error(0, errno, "fstat");
787
} else {
788
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
789
ret = fchown(plugindir_fd, uid, gid);
790
if(ret == -1){
791
error(0, errno, "fchown");
792
}
793
}
794
}
795
TEMP_FAILURE_RETRY(close(plugindir_fd));
796
}
797
}
798
799
/* Lower permissions */
800
ret = setgid(gid);
743
/* Strip permissions down to nobody */
744
setgid(gid);
801
745
if(ret == -1){
802
error(0, errno, "setgid");
746
perror("setgid");
803
747
}
804
748
ret = setuid(uid);
805
749
if(ret == -1){
806
error(0, errno, "setuid");
750
perror("setuid");
807
751
}
808
752
809
753
/* Open plugin directory with close_on_exec flag */
827
771
);
828
772
}
829
773
if(dir_fd == -1){
830
error(0, errno, "Could not open plugin dir");
774
perror("Could not open plugin dir");
831
775
exitstatus = EX_UNAVAILABLE;
832
776
goto fallback;
833
777
}
836
780
/* Set the FD_CLOEXEC flag on the directory */
837
781
ret = set_cloexec_flag(dir_fd);
838
782
if(ret < 0){
839
error(0, errno, "set_cloexec_flag");
783
perror("set_cloexec_flag");
840
784
TEMP_FAILURE_RETRY(close(dir_fd));
841
785
exitstatus = EX_OSERR;
842
786
goto fallback;
845
789
846
790
dir = fdopendir(dir_fd);
847
791
if(dir == NULL){
848
error(0, errno, "Could not open plugin dir");
792
perror("Could not open plugin dir");
849
793
TEMP_FAILURE_RETRY(close(dir_fd));
850
794
exitstatus = EX_OSERR;
851
795
goto fallback;
863
807
/* All directory entries have been processed */
864
808
if(dirst == NULL){
865
809
if(errno == EBADF){
866
error(0, errno, "readdir");
810
perror("readdir");
867
811
exitstatus = EX_IOERR;
868
812
goto fallback;
869
813
}
876
820
{
877
821
bool bad_name = false;
878
822
879
const char * const bad_prefixes[] = { ".", "#", NULL };
823
const char const *bad_prefixes[] = { ".", "#", NULL };
880
824
881
const char * const bad_suffixes[] = { "~", "#", ".dpkg-new",
825
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
882
826
".dpkg-old",
883
827
".dpkg-bak",
884
828
".dpkg-divert", NULL };
885
#ifdef __GNUC__
886
#pragma GCC diagnostic push
887
#pragma GCC diagnostic ignored "-Wcast-qual"
888
#endif
889
for(const char **pre = (const char **)bad_prefixes;
890
*pre != NULL; pre++){
891
#ifdef __GNUC__
892
#pragma GCC diagnostic pop
893
#endif
829
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
894
830
size_t pre_len = strlen(*pre);
895
831
if((d_name_len >= pre_len)
896
832
and strncmp((dirst->d_name), *pre, pre_len) == 0){
905
841
if(bad_name){
906
842
continue;
907
843
}
908
#ifdef __GNUC__
909
#pragma GCC diagnostic push
910
#pragma GCC diagnostic ignored "-Wcast-qual"
911
#endif
912
for(const char **suf = (const char **)bad_suffixes;
913
*suf != NULL; suf++){
914
#ifdef __GNUC__
915
#pragma GCC diagnostic pop
916
#endif
844
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
917
845
size_t suf_len = strlen(*suf);
918
846
if((d_name_len >= suf_len)
919
847
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
942
870
dirst->d_name));
943
871
}
944
872
if(ret < 0){
945
error(0, errno, "asprintf");
873
perror("asprintf");
946
874
continue;
947
875
}
948
876
949
877
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
950
878
if(ret == -1){
951
error(0, errno, "stat");
879
perror("stat");
952
880
free(filename);
953
881
continue;
954
882
}
966
894
967
895
plugin *p = getplugin(dirst->d_name);
968
896
if(p == NULL){
969
error(0, errno, "getplugin");
897
perror("getplugin");
970
898
free(filename);
971
899
continue;
972
900
}
984
912
if(g != NULL){
985
913
for(char **a = g->argv + 1; *a != NULL; a++){
986
914
if(not add_argument(p, *a)){
987
error(0, errno, "add_argument");
915
perror("add_argument");
988
916
}
989
917
}
990
918
/* Add global environment variables */
991
919
for(char **e = g->environ; *e != NULL; e++){
992
920
if(not add_environment(p, *e, false)){
993
error(0, errno, "add_environment");
921
perror("add_environment");
994
922
}
995
923
}
996
924
}
1001
929
if(p->environ[0] != NULL){
1002
930
for(char **e = environ; *e != NULL; e++){
1003
931
if(not add_environment(p, *e, false)){
1004
error(0, errno, "add_environment");
932
perror("add_environment");
1005
933
}
1006
934
}
1007
935
}
1009
937
int pipefd[2];
1010
938
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
1011
939
if(ret == -1){
1012
error(0, errno, "pipe");
940
perror("pipe");
1013
941
exitstatus = EX_OSERR;
1014
942
goto fallback;
1015
943
}
1016
944
/* Ask OS to automatic close the pipe on exec */
1017
945
ret = set_cloexec_flag(pipefd[0]);
1018
946
if(ret < 0){
1019
error(0, errno, "set_cloexec_flag");
947
perror("set_cloexec_flag");
1020
948
exitstatus = EX_OSERR;
1021
949
goto fallback;
1022
950
}
1023
951
ret = set_cloexec_flag(pipefd[1]);
1024
952
if(ret < 0){
1025
error(0, errno, "set_cloexec_flag");
953
perror("set_cloexec_flag");
1026
954
exitstatus = EX_OSERR;
1027
955
goto fallback;
1028
956
}
1031
959
&sigchld_action.sa_mask,
1032
960
NULL));
1033
961
if(ret < 0){
1034
error(0, errno, "sigprocmask");
962
perror("sigprocmask");
1035
963
exitstatus = EX_OSERR;
1036
964
goto fallback;
1037
965
}
1041
969
pid = fork();
1042
970
} while(pid == -1 and errno == EINTR);
1043
971
if(pid == -1){
1044
error(0, errno, "fork");
972
perror("fork");
1045
973
exitstatus = EX_OSERR;
1046
974
goto fallback;
1047
975
}
1049
977
/* this is the child process */
1050
978
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1051
979
if(ret < 0){
1052
error(0, errno, "sigaction");
980
perror("sigaction");
1053
981
_exit(EX_OSERR);
1054
982
}
1055
983
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1056
984
if(ret < 0){
1057
error(0, errno, "sigprocmask");
985
perror("sigprocmask");
1058
986
_exit(EX_OSERR);
1059
987
}
1060
988
1061
989
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1062
990
if(ret == -1){
1063
error(0, errno, "dup2");
991
perror("dup2");
1064
992
_exit(EX_OSERR);
1065
993
}
1066
994
1071
999
}
1072
1000
if(p->environ[0] == NULL){
1073
1001
if(execv(filename, p->argv) < 0){
1074
error(0, errno, "execv for %s", filename);
1002
perror("execv");
1075
1003
_exit(EX_OSERR);
1076
1004
}
1077
1005
} else {
1078
1006
if(execve(filename, p->argv, p->environ) < 0){
1079
error(0, errno, "execve for %s", filename);
1007
perror("execve");
1080
1008
_exit(EX_OSERR);
1081
1009
}
1082
1010
}
1088
1016
free(filename);
1089
1017
plugin *new_plugin = getplugin(dirst->d_name);
1090
1018
if(new_plugin == NULL){
1091
error(0, errno, "getplugin");
1019
perror("getplugin");
1092
1020
ret = (int)(TEMP_FAILURE_RETRY
1093
1021
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1094
1022
NULL)));
1095
1023
if(ret < 0){
1096
error(0, errno, "sigprocmask");
1024
perror("sigprocmask");
1097
1025
}
1098
1026
exitstatus = EX_OSERR;
1099
1027
goto fallback;
1108
1036
&sigchld_action.sa_mask,
1109
1037
NULL));
1110
1038
if(ret < 0){
1111
error(0, errno, "sigprocmask");
1039
perror("sigprocmask");
1112
1040
exitstatus = EX_OSERR;
1113
1041
goto fallback;
1114
1042
}
1115
1043
1116
#if defined (__GNUC__) and defined (__GLIBC__)
1117
#if not __GLIBC_PREREQ(2, 16)
1118
#pragma GCC diagnostic push
1119
#pragma GCC diagnostic ignored "-Wsign-conversion"
1120
#endif
1121
#endif
1122
1044
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1123
-Wconversion in GNU libc
1124
before 2.16 */
1125
#if defined (__GNUC__) and defined (__GLIBC__)
1126
#if not __GLIBC_PREREQ(2, 16)
1127
#pragma GCC diagnostic pop
1128
#endif
1129
#endif
1045
-Wconversion */
1130
1046
1131
1047
if(maxfd < new_plugin->fd){
1132
1048
maxfd = new_plugin->fd;
1153
1069
fd_set rfds = rfds_all;
1154
1070
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
1155
1071
if(select_ret == -1 and errno != EINTR){
1156
error(0, errno, "select");
1072
perror("select");
1157
1073
exitstatus = EX_OSERR;
1158
1074
goto fallback;
1159
1075
}
1186
1102
}
1187
1103
1188
1104
/* Remove the plugin */
1189
#if defined (__GNUC__) and defined (__GLIBC__)
1190
#if not __GLIBC_PREREQ(2, 16)
1191
#pragma GCC diagnostic push
1192
#pragma GCC diagnostic ignored "-Wsign-conversion"
1193
#endif
1194
#endif
1195
1105
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1196
-Wconversion in GNU libc
1197
before 2.16 */
1198
#if defined (__GNUC__) and defined (__GLIBC__)
1199
#if not __GLIBC_PREREQ(2, 16)
1200
#pragma GCC diagnostic pop
1201
#endif
1202
#endif
1106
-Wconversion */
1203
1107
1204
1108
/* Block signal while modifying process_list */
1205
1109
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1207
1111
&sigchld_action.sa_mask,
1208
1112
NULL));
1209
1113
if(ret < 0){
1210
error(0, errno, "sigprocmask");
1114
perror("sigprocmask");
1211
1115
exitstatus = EX_OSERR;
1212
1116
goto fallback;
1213
1117
}
1221
1125
(sigprocmask(SIG_UNBLOCK,
1222
1126
&sigchld_action.sa_mask, NULL)));
1223
1127
if(ret < 0){
1224
error(0, errno, "sigprocmask");
1128
perror("sigprocmask");
1225
1129
exitstatus = EX_OSERR;
1226
1130
goto fallback;
1227
1131
}
1238
1142
bool bret = print_out_password(proc->buffer,
1239
1143
proc->buffer_length);
1240
1144
if(not bret){
1241
error(0, errno, "print_out_password");
1145
perror("print_out_password");
1242
1146
exitstatus = EX_IOERR;
1243
1147
}
1244
1148
goto fallback;
1245
1149
}
1246
1150
1247
1151
/* This process has not completed. Does it have any output? */
1248
#if defined (__GNUC__) and defined (__GLIBC__)
1249
#if not __GLIBC_PREREQ(2, 16)
1250
#pragma GCC diagnostic push
1251
#pragma GCC diagnostic ignored "-Wsign-conversion"
1252
#endif
1253
#endif
1254
1152
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1255
1153
warning from
1256
-Wconversion
1257
in GNU libc
1258
before
1259
2.16 */
1260
#if defined (__GNUC__) and defined (__GLIBC__)
1261
#if not __GLIBC_PREREQ(2, 16)
1262
#pragma GCC diagnostic pop
1263
#endif
1264
#endif
1154
-Wconversion */
1265
1155
/* This process had nothing to say at this time */
1266
1156
proc = proc->next;
1267
1157
continue;
1268
1158
}
1269
1159
/* Before reading, make the process' data buffer large enough */
1270
1160
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1271
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1272
+ (size_t) BUFFER_SIZE);
1273
if(new_buffer == NULL){
1274
error(0, errno, "malloc");
1161
proc->buffer = realloc(proc->buffer, proc->buffer_size
1162
+ (size_t) BUFFER_SIZE);
1163
if(proc->buffer == NULL){
1164
perror("malloc");
1275
1165
exitstatus = EX_OSERR;
1276
1166
goto fallback;
1277
1167
}
1278
proc->buffer = new_buffer;
1279
1168
proc->buffer_size += BUFFER_SIZE;
1280
1169
}
1281
1170
/* Read from the process */
1315
1204
}
1316
1205
bret = print_out_password(passwordbuffer, len);
1317
1206
if(not bret){
1318
error(0, errno, "print_out_password");
1207
perror("print_out_password");
1319
1208
exitstatus = EX_IOERR;
1320
1209
}
1321
1210
}
1323
1212
/* Restore old signal handler */
1324
1213
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1325
1214
if(ret == -1){
1326
error(0, errno, "sigaction");
1215
perror("sigaction");
1327
1216
exitstatus = EX_OSERR;
1328
1217
}
1329
1218
1345
1234
ret = kill(p->pid, SIGTERM);
1346
1235
if(ret == -1 and errno != ESRCH){
1347
1236
/* Set-uid proccesses might not get closed */
1348
error(0, errno, "kill");
1237
perror("kill");
1349
1238
}
1350
1239
}
1351
1240
}
1355
1244
ret = wait(NULL);
1356
1245
} while(ret >= 0);
1357
1246
if(errno != ECHILD){
1358
error(0, errno, "wait");
1247
perror("wait");
1359
1248
}
1360
1249
1361
1250
free_plugin_list();
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0