/mandos/trunk : revision 271

1

/* -*- coding: utf-8; mode: c; mode: orgtbl -*- */

1

/* -*- coding: utf-8 -*- */

2

/*

3

* Mandos plugin runner - Run Mandos plugins

4

*

23

*/

24

25

#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),

26

asprintf(), O_CLOEXEC */

26

asprintf() */

27

#include <stddef.h> /* size_t, NULL */

28

#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,

29

EXIT_SUCCESS, realloc() */

30

#include <stdbool.h> /* bool, true, false */

31

#include <stdio.h> /* perror, fileno(), fprintf(),

32

stderr, STDOUT_FILENO */

33

#include <sys/types.h> /* DIR, fdopendir(), stat(), struct

33

#include <sys/types.h> /* DIR, opendir(), stat(), struct

34

stat, waitpid(), WIFEXITED(),

35

WEXITSTATUS(), wait(), pid_t,

36

uid_t, gid_t, getuid(), getgid(),

38

#include <sys/select.h> /* fd_set, select(), FD_ZERO(),

39

FD_SET(), FD_ISSET(), FD_CLR */

40

#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),

41

WEXITSTATUS(), WTERMSIG(),

42

WCOREDUMP() */

41

WEXITSTATUS() */

43

42

#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */

44

43

#include <iso646.h> /* and, or, not */

45

#include <dirent.h> /* DIR, struct dirent, fdopendir(),

44

#include <dirent.h> /* DIR, struct dirent, opendir(),

46

45

readdir(), closedir(), dirfd() */

47

46

#include <unistd.h> /* struct stat, stat(), S_ISREG(),

48

47

fcntl(), setuid(), setgid(),

53

52

close() */

54

53

#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,

55

54

FD_CLOEXEC */

56

#include <string.h> /* strsep, strlen(), asprintf(),

57

strsignal() */

55

#include <string.h> /* strsep, strlen(), asprintf() */

58

56

#include <errno.h> /* errno */

59

57

#include <argp.h> /* struct argp_option, struct

60

58

argp_state, struct argp,

64

62

#include <signal.h> /* struct sigaction, sigemptyset(),

65

63

sigaddset(), sigaction(),

66

64

sigprocmask(), SIG_BLOCK, SIGCHLD,

67

SIG_UNBLOCK, kill(), sig_atomic_t

68

*/

65

SIG_UNBLOCK, kill() */

69

66

#include <errno.h> /* errno, EBADF */

70

#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */

67

#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */

71

68

72

69

#define BUFFER_SIZE 256

73

70

84

81

char **environ;

85

82

int envc;

86

83

bool disabled;

87

84

88

85

/* Variables used for running processes*/

89

86

pid_t pid;

90

87

int fd;

92

89

size_t buffer_size;

93

90

size_t buffer_length;

94

91

bool eof;

95

volatile sig_atomic_t completed;

96

int status;

92

volatile bool completed;

93

volatile int status;

97

94

struct plugin *next;

98

95

} plugin;

99

96

110

107

}

111

108

}

112

109

/* Create a new plugin */

113

plugin *new_plugin = NULL;

114

do {

115

new_plugin = malloc(sizeof(plugin));

116

} while(new_plugin == NULL and errno == EINTR);

110

plugin *new_plugin = malloc(sizeof(plugin));

117

111

if(new_plugin == NULL){

118

112

return NULL;

119

113

}

120

114

char *copy_name = NULL;

121

115

if(name != NULL){

122

do {

123

copy_name = strdup(name);

124

} while(copy_name == NULL and errno == EINTR);

116

copy_name = strdup(name);

125

117

if(copy_name == NULL){

126

free(new_plugin);

127

118

return NULL;

128

119

}

129

120

}

130

121

131

*new_plugin = (plugin){ .name = copy_name,

132

.argc = 1,

133

.disabled = false,

134

.next = plugin_list };

122

*new_plugin = (plugin) { .name = copy_name,

123

.argc = 1,

124

.disabled = false,

125

.next = plugin_list };

135

126

136

do {

137

new_plugin->argv = malloc(sizeof(char *) * 2);

138

} while(new_plugin->argv == NULL and errno == EINTR);

127

new_plugin->argv = malloc(sizeof(char *) * 2);

139

128

if(new_plugin->argv == NULL){

140

129

free(copy_name);

141

130

free(new_plugin);

144

133

new_plugin->argv[0] = copy_name;

145

134

new_plugin->argv[1] = NULL;

146

135

147

do {

148

new_plugin->environ = malloc(sizeof(char *));

149

} while(new_plugin->environ == NULL and errno == EINTR);

136

new_plugin->environ = malloc(sizeof(char *));

150

137

if(new_plugin->environ == NULL){

151

138

free(copy_name);

152

139

free(new_plugin->argv);

164

151

static bool add_to_char_array(const char *new, char ***array,

165

152

int *len){

166

153

/* Resize the pointed-to array to hold one more pointer */

167

do {

168

*array = realloc(*array, sizeof(char *)

169

* (size_t) ((*len) + 2));

170

} while(*array == NULL and errno == EINTR);

154

*array = realloc(*array, sizeof(char *)

155

* (size_t) ((*len) + 2));

171

156

/* Malloc check */

172

157

if(*array == NULL){

173

158

return false;

174

159

}

175

160

/* Make a copy of the new string */

176

char *copy;

177

do {

178

copy = strdup(new);

179

} while(copy == NULL and errno == EINTR);

161

char *copy = strdup(new);

180

162

if(copy == NULL){

181

163

return false;

182

164

}

208

190

if(strncmp(*e, def, namelen + 1) == 0){

209

191

/* It already exists */

210

192

if(replace){

211

char *new;

212

do {

213

new = realloc(*e, strlen(def) + 1);

214

} while(new == NULL and errno == EINTR);

193

char *new = realloc(*e, strlen(def) + 1);

215

194

if(new == NULL){

216

195

return false;

217

196

}

227

206

/*

228

207

* Based on the example in the GNU LibC manual chapter 13.13 "File

229

208

* Descriptor Flags".

230

| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |

209

* *Note File Descriptor Flags:(libc)Descriptor Flags.

231

210

*/

232

211

static int set_cloexec_flag(int fd){

233

int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));

212

int ret = fcntl(fd, F_GETFD, 0);

234

213

/* If reading the flags failed, return error indication now. */

235

214

if(ret < 0){

236

215

return ret;

237

216

}

238

217

/* Store modified flag word in the descriptor. */

239

return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,

240

ret | FD_CLOEXEC));

218

return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);

241

219

}

242

220

243

221

244

222

/* Mark processes as completed when they exit, and save their exit

245

223

status. */

246

224

static void handle_sigchld(__attribute__((unused)) int sig){

247

int old_errno = errno;

248

225

while(true){

249

226

plugin *proc = plugin_list;

250

227

int status;

254

231

break;

255

232

}

256

233

if(pid == -1){

257

if(errno == ECHILD){

258

/* No child processes */

259

break;

234

if(errno != ECHILD){

235

perror("waitpid");

260

236

}

261

perror("waitpid");

237

/* No child processes */

238

break;

262

239

}

263

240

264

241

/* A child exited, find it in process_list */

270

247

continue;

271

248

}

272

249

proc->status = status;

273

proc->completed = 1;

250

proc->completed = true;

274

251

}

275

errno = old_errno;

276

252

}

277

253

278

254

/* Prints out a password to stdout */

300

276

}

301

277

free(plugin_node->environ);

302

278

free(plugin_node->buffer);

303

279

304

280

/* Removes the plugin from the singly-linked list */

305

281

if(plugin_node == plugin_list){

306

282

/* First one - simple */

333

309

struct dirent *dirst;

334

310

struct stat st;

335

311

fd_set rfds_all;

336

int ret, maxfd = 0;

312

int ret, numchars, maxfd = 0;

337

313

ssize_t sret;

314

intmax_t tmpmax;

338

315

uid_t uid = 65534;

339

316

gid_t gid = 65534;

340

317

bool debug = false;

398

375

};

399

376

400

377

error_t parse_opt(int key, char *arg, __attribute__((unused))

401

struct argp_state *state){

402

switch(key){

403

char *tmp;

404

intmax_t tmpmax;

378

struct argp_state *state) {

379

switch(key) {

405

380

case 'g': /* --global-options */

406

381

if(arg != NULL){

407

char *plugin_option;

408

while((plugin_option = strsep(&arg, ",")) != NULL){

409

if(plugin_option[0] == '\0'){

382

char *p;

383

while((p = strsep(&arg, ",")) != NULL){

384

if(p[0] == '\0'){

410

385

continue;

411

386

}

412

if(not add_argument(getplugin(NULL), plugin_option)){

387

if(not add_argument(getplugin(NULL), p)){

413

388

perror("add_argument");

414

389

return ARGP_ERR_UNKNOWN;

415

390

}

426

401

break;

427

402

case 'o': /* --options-for */

428

403

if(arg != NULL){

429

char *plugin_name = strsep(&arg, ":");

430

if(plugin_name[0] == '\0'){

431

break;

432

}

433

char *plugin_option;

434

while((plugin_option = strsep(&arg, ",")) != NULL){

435

if(not add_argument(getplugin(plugin_name), plugin_option)){

404

char *p_name = strsep(&arg, ":");

405

if(p_name[0] == '\0' or arg == NULL){

406

break;

407

}

408

char *opt = strsep(&arg, ":");

409

if(opt[0] == '\0' or opt == NULL){

410

break;

411

}

412

char *p;

413

while((p = strsep(&opt, ",")) != NULL){

414

if(p[0] == '\0'){

415

continue;

416

}

417

if(not add_argument(getplugin(p_name), p)){

436

418

perror("add_argument");

437

419

return ARGP_ERR_UNKNOWN;

438

420

}

477

459

plugindir = strdup(arg);

478

460

if(plugindir == NULL){

479

461

perror("strdup");

480

}

462

}

481

463

break;

482

464

case 129: /* --config-file */

483

465

/* This is already done by parse_opt_config_file() */

484

466

break;

485

467

case 130: /* --userid */

486

errno = 0;

487

tmpmax = strtoimax(arg, &tmp, 10);

488

if(errno != 0 or tmp == arg or *tmp != '\0'

489

or tmpmax != (uid_t)tmpmax){

468

ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);

469

if(ret < 1 or tmpmax != (uid_t)tmpmax

470

or arg[numchars] != '\0'){

490

471

fprintf(stderr, "Bad user ID number: \"%s\", using %"

491

472

PRIdMAX "\n", arg, (intmax_t)uid);

492

473

} else {

494

475

}

495

476

break;

496

477

case 131: /* --groupid */

497

errno = 0;

498

tmpmax = strtoimax(arg, &tmp, 10);

499

if(errno != 0 or tmp == arg or *tmp != '\0'

500

or tmpmax != (gid_t)tmpmax){

478

ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);

479

if(ret < 1 or tmpmax != (gid_t)tmpmax

480

or arg[numchars] != '\0'){

501

481

fprintf(stderr, "Bad group ID number: \"%s\", using %"

502

482

PRIdMAX "\n", arg, (intmax_t)gid);

503

483

} else {

531

511

ignores everything but the --config-file option. */

532

512

error_t parse_opt_config_file(int key, char *arg,

533

513

__attribute__((unused))

534

struct argp_state *state){

535

switch(key){

514

struct argp_state *state) {

515

switch(key) {

536

516

case 'g': /* --global-options */

537

517

case 'G': /* --global-env */

538

518

case 'o': /* --options-for */

547

527

if(argfile == NULL){

548

528

perror("strdup");

549

529

}

550

break;

530

break;

551

531

case 130: /* --userid */

552

532

case 131: /* --groupid */

553

533

case 132: /* --debug */

582

562

conffp = fopen(AFILE, "r");

583

563

} else {

584

564

conffp = fopen(argfile, "r");

585

}

565

}

586

566

if(conffp != NULL){

587

567

char *org_line = NULL;

588

568

char *p, *arg, *new_arg, *line;

589

569

size_t size = 0;

590

570

const char whitespace_delims[] = " \r\t\f\v\n";

591

571

const char comment_delim[] = "#";

592

572

593

573

custom_argc = 1;

594

574

custom_argv = malloc(sizeof(char*) * 2);

595

575

if(custom_argv == NULL){

599

579

}

600

580

custom_argv[0] = argv[0];

601

581

custom_argv[1] = NULL;

602

582

603

583

/* for each line in the config file, strip whitespace and ignore

604

584

commented text */

605

585

while(true){

607

587

if(sret == -1){

608

588

break;

609

589

}

610

590

611

591

line = org_line;

612

592

arg = strsep(&line, comment_delim);

613

593

while((p = strsep(&arg, whitespace_delims)) != NULL){

632

612

goto fallback;

633

613

}

634

614

custom_argv[custom_argc-1] = new_arg;

635

custom_argv[custom_argc] = NULL;

615

custom_argv[custom_argc] = NULL;

636

616

}

637

617

}

638

do {

639

ret = fclose(conffp);

640

} while(ret == EOF and errno == EINTR);

641

if(ret == EOF){

642

perror("fclose");

643

exitstatus = EXIT_FAILURE;

644

goto fallback;

645

}

646

618

free(org_line);

647

619

} else {

648

620

/* Check for harmful errors and go to fallback. Other errors might

689

661

}

690

662

691

663

/* Strip permissions down to nobody */

664

ret = setuid(uid);

665

if(ret == -1){

666

perror("setuid");

667

}

692

668

setgid(gid);

693

669

if(ret == -1){

694

670

perror("setgid");

695

671

}

696

ret = setuid(uid);

697

if(ret == -1){

698

perror("setuid");

699

}

700

701

/* Open plugin directory with close_on_exec flag */

672

673

if(plugindir == NULL){

674

dir = opendir(PDIR);

675

} else {

676

dir = opendir(plugindir);

677

}

678

679

if(dir == NULL){

680

perror("Could not open plugin dir");

681

exitstatus = EXIT_FAILURE;

682

goto fallback;

683

}

684

685

/* Set the FD_CLOEXEC flag on the directory, if possible */

702

686

{

703

int dir_fd = -1;

704

if(plugindir == NULL){

705

dir_fd = open(PDIR, O_RDONLY |

706

#ifdef O_CLOEXEC

707

O_CLOEXEC

708

#else /* not O_CLOEXEC */

709

0

710

#endif /* not O_CLOEXEC */

711

);

712

} else {

713

dir_fd = open(plugindir, O_RDONLY |

714

#ifdef O_CLOEXEC

715

O_CLOEXEC

716

#else /* not O_CLOEXEC */

717

0

718

#endif /* not O_CLOEXEC */

719

);

720

}

721

if(dir_fd == -1){

722

perror("Could not open plugin dir");

723

exitstatus = EXIT_FAILURE;

724

goto fallback;

725

}

726

727

#ifndef O_CLOEXEC

728

/* Set the FD_CLOEXEC flag on the directory */

729

ret = set_cloexec_flag(dir_fd);

730

if(ret < 0){

731

perror("set_cloexec_flag");

732

TEMP_FAILURE_RETRY(close(dir_fd));

733

exitstatus = EXIT_FAILURE;

734

goto fallback;

735

}

736

#endif /* O_CLOEXEC */

737

738

dir = fdopendir(dir_fd);

739

if(dir == NULL){

740

perror("Could not open plugin dir");

741

TEMP_FAILURE_RETRY(close(dir_fd));

742

exitstatus = EXIT_FAILURE;

743

goto fallback;

687

int dir_fd = dirfd(dir);

688

if(dir_fd >= 0){

689

ret = set_cloexec_flag(dir_fd);

690

if(ret < 0){

691

perror("set_cloexec_flag");

692

exitstatus = EXIT_FAILURE;

693

goto fallback;

694

}

744

695

}

745

696

}

746

697

748

699

749

700

/* Read and execute any executable in the plugin directory*/

750

701

while(true){

751

do {

752

dirst = readdir(dir);

753

} while(dirst == NULL and errno == EINTR);

702

dirst = readdir(dir);

754

703

755

704

/* All directory entries have been processed */

756

705

if(dirst == NULL){

807

756

continue;

808

757

}

809

758

}

810

759

811

760

char *filename;

812

761

if(plugindir == NULL){

813

ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",

814

dirst->d_name));

762

ret = asprintf(&filename, PDIR "/%s", dirst->d_name);

815

763

} else {

816

ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",

817

plugindir,

818

dirst->d_name));

764

ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);

819

765

}

820

766

if(ret < 0){

821

767

perror("asprintf");

822

768

continue;

823

769

}

824

770

825

ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));

771

ret = stat(filename, &st);

826

772

if(ret == -1){

827

773

perror("stat");

828

774

free(filename);

829

775

continue;

830

776

}

831

777

832

778

/* Ignore non-executable files */

833

if(not S_ISREG(st.st_mode)

834

or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){

779

if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){

835

780

if(debug){

836

781

fprintf(stderr, "Ignoring plugin dir entry \"%s\""

837

782

" with bad type or mode\n", filename);

883

828

}

884

829

885

830

int pipefd[2];

886

ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));

831

ret = pipe(pipefd);

887

832

if(ret == -1){

888

833

perror("pipe");

889

834

exitstatus = EXIT_FAILURE;

903

848

goto fallback;

904

849

}

905

850

/* Block SIGCHLD until process is safely in process list */

906

ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,

907

&sigchld_action.sa_mask,

908

NULL));

851

ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);

909

852

if(ret < 0){

910

853

perror("sigprocmask");

911

854

exitstatus = EXIT_FAILURE;

912

855

goto fallback;

913

856

}

914

857

/* Starting a new process to be watched */

915

pid_t pid;

916

do {

917

pid = fork();

918

} while(pid == -1 and errno == EINTR);

858

pid_t pid = fork();

919

859

if(pid == -1){

920

860

perror("fork");

921

861

exitstatus = EXIT_FAILURE;

959

899

/* no return */

960

900

}

961

901

/* Parent process */

962

TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of

963

pipe */

902

close(pipefd[1]); /* Close unused write end of pipe */

964

903

free(filename);

965

904

plugin *new_plugin = getplugin(dirst->d_name);

966

905

if(new_plugin == NULL){

967

906

perror("getplugin");

968

ret = (int)(TEMP_FAILURE_RETRY

969

(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,

970

NULL)));

907

ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);

971

908

if(ret < 0){

972

909

perror("sigprocmask");

973

910

}

980

917

981

918

/* Unblock SIGCHLD so signal handler can be run if this process

982

919

has already completed */

983

ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,

984

&sigchld_action.sa_mask,

985

NULL));

920

ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);

986

921

if(ret < 0){

987

922

perror("sigprocmask");

988

923

exitstatus = EXIT_FAILURE;

989

924

goto fallback;

990

925

}

991

926

992

FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from

993

-Wconversion */

927

FD_SET(new_plugin->fd, &rfds_all);

994

928

995

929

if(maxfd < new_plugin->fd){

996

930

maxfd = new_plugin->fd;

997

931

}

998

932

}

999

933

1000

TEMP_FAILURE_RETRY(closedir(dir));

934

closedir(dir);

1001

935

dir = NULL;

1002

free_plugin(getplugin(NULL));

1003

936

1004

937

for(plugin *p = plugin_list; p != NULL; p = p->next){

1005

938

if(p->pid != 0){

1016

949

while(plugin_list){

1017

950

fd_set rfds = rfds_all;

1018

951

int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);

1019

if(select_ret == -1 and errno != EINTR){

952

if(select_ret == -1){

1020

953

perror("select");

1021

954

exitstatus = EXIT_FAILURE;

1022

955

goto fallback;

1025

958

from one of them */

1026

959

for(plugin *proc = plugin_list; proc != NULL;){

1027

960

/* Is this process completely done? */

1028

if(proc->completed and proc->eof){

961

if(proc->eof and proc->completed){

1029

962

/* Only accept the plugin output if it exited cleanly */

1030

963

if(not WIFEXITED(proc->status)

1031

964

or WEXITSTATUS(proc->status) != 0){

1032

965

/* Bad exit by plugin */

1033

966

1034

967

if(debug){

1035

968

if(WIFEXITED(proc->status)){

1036

fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"

1037

" status %d\n", proc->name,

1038

(intmax_t) (proc->pid),

969

fprintf(stderr, "Plugin %" PRIdMAX " exited with status"

970

" %d\n", (intmax_t) (proc->pid),

1039

971

WEXITSTATUS(proc->status));

1040

} else if(WIFSIGNALED(proc->status)){

1041

fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"

1042

" signal %d: %s\n", proc->name,

1043

(intmax_t) (proc->pid),

1044

WTERMSIG(proc->status),

1045

strsignal(WTERMSIG(proc->status)));

972

} else if(WIFSIGNALED(proc->status)) {

973

fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"

974

" %d\n", (intmax_t) (proc->pid),

975

WTERMSIG(proc->status));

1046

976

} else if(WCOREDUMP(proc->status)){

1047

fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"

1048

" core\n", proc->name, (intmax_t) (proc->pid));

977

fprintf(stderr, "Plugin %" PRIdMAX " dumped core\n",

978

(intmax_t) (proc->pid));

1049

979

}

1050

980

}

1051

981

1052

982

/* Remove the plugin */

1053

FD_CLR(proc->fd, &rfds_all); /* Spurious warning from

1054

-Wconversion */

1055

983

FD_CLR(proc->fd, &rfds_all);

984

1056

985

/* Block signal while modifying process_list */

1057

ret = (int)TEMP_FAILURE_RETRY(sigprocmask

1058

(SIG_BLOCK,

1059

&sigchld_action.sa_mask,

1060

NULL));

986

ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);

1061

987

if(ret < 0){

1062

988

perror("sigprocmask");

1063

989

exitstatus = EXIT_FAILURE;

1069

995

proc = next_plugin;

1070

996

1071

997

/* We are done modifying process list, so unblock signal */

1072

ret = (int)(TEMP_FAILURE_RETRY

1073

(sigprocmask(SIG_UNBLOCK,

1074

&sigchld_action.sa_mask, NULL)));

998

ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,

999

NULL);

1075

1000

if(ret < 0){

1076

1001

perror("sigprocmask");

1077

1002

exitstatus = EXIT_FAILURE;

1097

1022

}

1098

1023

1099

1024

/* This process has not completed. Does it have any output? */

1100

if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious

1101

warning from

1102

-Wconversion */

1025

if(proc->eof or not FD_ISSET(proc->fd, &rfds)){

1103

1026

/* This process had nothing to say at this time */

1104

1027

proc = proc->next;

1105

1028

continue;

1116

1039

proc->buffer_size += BUFFER_SIZE;

1117

1040

}

1118

1041

/* Read from the process */

1119

sret = TEMP_FAILURE_RETRY(read(proc->fd,

1120

proc->buffer

1121

+ proc->buffer_length,

1122

BUFFER_SIZE));

1042

sret = read(proc->fd, proc->buffer + proc->buffer_length,

1043

BUFFER_SIZE);

1123

1044

if(sret < 0){

1124

1045

/* Read error from this process; ignore the error */

1125

1046

proc = proc->next;

1133

1054

}

1134

1055

}

1135

1056

}

1136

1137

1057

1058

1138

1059

fallback:

1139

1060

1140

1061

if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){

1187

1108

}

1188

1109

1189

1110

/* Wait for any remaining child processes to terminate */

1190

do {

1111

do{

1191

1112

ret = wait(NULL);

1192

1113

} while(ret >= 0);

1193

1114

if(errno != ECHILD){