/mandos/release : revision 68

21

* Contact the authors at <mandos@fukt.bsnet.se>.

22

*/

23

24

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

25

asprintf() */

24

#define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */

25

26

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

27

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

28

EXIT_SUCCESS, realloc() */

51

close() */

52

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

53

FD_CLOEXEC */

54

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

54

#include <string.h> /* strtok, strlen(), strcpy(),

55

strcat() */

55

56

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

56

57

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

57

58

argp_state, struct argp,

58

59

argp_parse(), ARGP_ERR_UNKNOWN,

59

ARGP_KEY_END, ARGP_KEY_ARG,

60

error_t */

60

ARGP_KEY_END, ARGP_KEY_ARG, error_t */

61

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

62

sigaddset(), sigaction(),

63

sigprocmask(), SIG_BLOCK, SIGCHLD,

65

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

66

67

#define BUFFER_SIZE 256

68

#define ARGFILE "/conf/conf.d/mandos/plugin-runner.conf"

69

68

70

const char *argp_program_version = "plugin-runner 1.0";

69

const char *argp_program_version = "mandos-client 1.0";

71

70

const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";

72

71

73

72

struct process;

79

78

size_t buffer_size;

80

79

size_t buffer_length;

81

80

bool eof;

82

volatile bool completed;

83

volatile int status;

81

bool completed;

82

int status;

84

83

struct process *next;

85

84

} process;

86

85

88

87

char *name; /* can be NULL or any plugin name */

89

88

char **argv;

90

89

int argc;

91

char **environ;

92

int envc;

93

90

bool disabled;

94

91

struct plugin *next;

95

92

} plugin;

104

101

/* Create a new plugin */

105

102

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

106

103

if (new_plugin == NULL){

107

return NULL;

108

}

109

char *copy_name = NULL;

110

if(name != NULL){

111

copy_name = strdup(name);

112

if(copy_name == NULL){

113

return NULL;

114

}

115

}

116

117

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

118

.argc = 1,

119

.envc = 0,

120

.disabled = false,

121

.next = *plugin_list };

122

104

perror("malloc");

105

exit(EXIT_FAILURE);

106

}

107

new_plugin->name = name;

123

108

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

124

109

if (new_plugin->argv == NULL){

125

free(copy_name);

126

free(new_plugin);

127

return NULL;

110

perror("malloc");

111

exit(EXIT_FAILURE);

128

112

}

129

new_plugin->argv[0] = copy_name;

113

new_plugin->argv[0] = name;

130

114

new_plugin->argv[1] = NULL;

131

132

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

133

if(new_plugin->environ == NULL){

134

free(copy_name);

135

free(new_plugin->argv);

136

free(new_plugin);

137

return NULL;

138

}

139

new_plugin->environ[0] = NULL;

115

new_plugin->argc = 1;

116

new_plugin->disabled = false;

117

new_plugin->next = *plugin_list;

140

118

/* Append the new plugin to the list */

141

119

*plugin_list = new_plugin;

142

120

return new_plugin;

143

121

}

144

122

145

/* Helper function for add_argument and add_environment */

146

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

147

int *len){

148

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

149

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

150

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

151

/* Malloc check */

152

if(*array == NULL){

153

return false;

154

}

155

/* Make a copy of the new string */

156

char *copy = strdup(new);

157

if(copy == NULL){

158

return false;

159

}

160

/* Insert the copy */

161

(*array)[*len] = copy;

162

(*len)++;

163

/* Add a new terminating NULL pointer to the last element */

164

(*array)[*len] = NULL;

165

return true;

166

}

167

168

/* Add to a plugin's argument vector */

169

static bool add_argument(plugin *p, const char *arg){

170

if(p == NULL){

171

return false;

172

}

173

return add_to_char_array(arg, &(p->argv), &(p->argc));

174

}

175

176

/* Add to a plugin's environment */

177

static bool add_environment(plugin *p, const char *def){

178

if(p == NULL){

179

return false;

180

}

181

return add_to_char_array(def, &(p->environ), &(p->envc));

182

}

183

123

static void addargument(plugin *p, char *arg){

124

p->argv[p->argc] = arg;

125

p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));

126

if (p->argv == NULL){

127

perror("malloc");

128

exit(EXIT_FAILURE);

129

}

130

p->argc++;

131

p->argv[p->argc] = NULL;

132

}

184

133

185

134

/*

186

135

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

200

149

201

150

process *process_list = NULL;

202

151

203

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

152

/* Mark a process as completed when it exits, and save its exit

204

153

status. */

205

154

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

206

while(true){

207

process *proc = process_list;

208

int status;

209

pid_t pid = waitpid(-1, &status, WNOHANG);

210

if(pid == 0){

211

/* Only still running child processes */

212

break;

213

}

214

if(pid == -1){

215

if (errno != ECHILD){

216

perror("waitpid");

217

}

218

/* No child processes */

219

break;

220

}

221

222

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

223

while(proc != NULL and proc->pid != pid){

224

proc = proc->next;

225

}

226

if(proc == NULL){

227

/* Process not found in process list */

228

continue;

229

}

230

proc->status = status;

231

proc->completed = true;

232

}

155

process *proc = process_list;

156

int status;

157

pid_t pid = wait(&status);

158

if(pid == -1){

159

perror("wait");

160

return;

161

}

162

while(proc != NULL and proc->pid != pid){

163

proc = proc->next;

164

}

165

if(proc == NULL){

166

/* Process not found in process list */

167

return;

168

}

169

proc->status = status;

170

proc->completed = true;

233

171

}

234

172

235

173

bool print_out_password(const char *buffer, size_t length){

247

185

return true;

248

186

}

249

187

250

static void free_plugin_list(plugin *plugin_list){

251

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

252

next = plugin_list->next;

253

for(char **arg = plugin_list->argv; *arg != NULL; arg++){

254

free(*arg);

255

}

256

free(plugin_list->argv);

257

for(char **env = plugin_list->environ; *env != NULL; env++){

258

free(*env);

259

}

260

free(plugin_list->environ);

261

free(plugin_list);

262

}

263

}

264

265

188

int main(int argc, char *argv[]){

266

const char *plugindir = "/lib/mandos/plugins.d";

267

const char *argfile = ARGFILE;

268

FILE *conffp;

189

const char *plugindir = "/conf/conf.d/mandos/plugins.d";

269

190

size_t d_name_len;

270

191

DIR *dir = NULL;

271

192

struct dirent *dirst;

279

200

struct sigaction old_sigchld_action;

280

201

struct sigaction sigchld_action = { .sa_handler = handle_sigchld,

281

202

.sa_flags = SA_NOCLDSTOP };

282

char **custom_argv = NULL;

283

int custom_argc = 0;

284

203

char *plus_options = NULL;

204

char **plus_argv = NULL;

205

285

206

/* Establish a signal handler */

286

207

sigemptyset(&sigchld_action.sa_mask);

287

208

ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);

288

if(ret == -1){

209

if(ret < 0){

289

210

perror("sigaddset");

290

exitstatus = EXIT_FAILURE;

291

goto fallback;

211

exit(EXIT_FAILURE);

292

212

}

293

213

ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);

294

if(ret == -1){

214

if(ret < 0){

295

215

perror("sigaction");

296

exitstatus = EXIT_FAILURE;

297

goto fallback;

216

exit(EXIT_FAILURE);

298

217

}

299

218

300

219

/* The options we understand. */

302

221

{ .name = "global-options", .key = 'g',

303

222

.arg = "OPTION[,OPTION[,...]]",

304

223

.doc = "Options passed to all plugins" },

305

{ .name = "global-envs", .key = 'e',

306

.arg = "VAR=value",

307

.doc = "Environment variable passed to all plugins" },

308

224

{ .name = "options-for", .key = 'o',

309

225

.arg = "PLUGIN:OPTION[,OPTION[,...]]",

310

226

.doc = "Options passed only to specified plugin" },

311

{ .name = "envs-for", .key = 'f',

312

.arg = "PLUGIN:ENV=value",

313

.doc = "Environment variable passed to specified plugin" },

314

227

{ .name = "disable", .key = 'd',

315

228

.arg = "PLUGIN",

316

229

.doc = "Disable a specific plugin", .group = 1 },

335

248

switch (key) {

336

249

case 'g':

337

250

if (arg != NULL){

338

char *p;

339

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

340

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

341

continue;

342

}

343

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

344

perror("add_argument");

345

return ARGP_ERR_UNKNOWN;

346

}

347

}

348

}

349

break;

350

case 'e':

351

if(arg == NULL){

352

break;

353

}

354

{

355

char *envdef = strdup(arg);

356

if(envdef == NULL){

357

break;

358

}

359

if(not add_environment(getplugin(NULL, plugins), envdef)){

360

perror("add_environment");

361

}

251

char *p = strtok(arg, ",");

252

do{

253

addargument(getplugin(NULL, plugins), p);

254

p = strtok(NULL, ",");

255

} while (p != NULL);

362

256

}

363

257

break;

364

258

case 'o':

365

259

if (arg != NULL){

366

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

367

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

368

break;

369

}

370

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

371

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

372

break;

373

}

374

if(opt != NULL){

375

char *p;

376

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

377

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

378

continue;

379

}

380

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

381

perror("add_argument");

382

return ARGP_ERR_UNKNOWN;

383

}

384

}

385

}

386

}

387

break;

388

case 'f':

389

if(arg == NULL){

390

break;

391

}

392

{

393

char *envdef = strchr(arg, ':');

394

if(envdef == NULL){

395

break;

396

}

397

char *p_name = strndup(arg, (size_t) (envdef-arg));

398

if(p_name == NULL){

399

break;

400

}

401

envdef++;

402

if(not add_environment(getplugin(p_name, plugins), envdef)){

403

perror("add_environment");

260

char *name = strtok(arg, ":");

261

char *p = strtok(NULL, ":");

262

if(p != NULL){

263

p = strtok(p, ",");

264

do{

265

addargument(getplugin(name, plugins), p);

266

p = strtok(NULL, ",");

267

} while (p != NULL);

404

268

}

405

269

}

406

270

break;

407

271

case 'd':

408

272

if (arg != NULL){

409

plugin *p = getplugin(arg, plugins);

410

if(p == NULL){

411

return ARGP_ERR_UNKNOWN;

412

}

413

p->disabled = true;

273

getplugin(arg, plugins)->disabled = true;

414

274

}

415

275

break;

416

276

case 128:

426

286

debug = true;

427

287

break;

428

288

case ARGP_KEY_ARG:

429

fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);

289

if(plus_options != NULL or arg == NULL or arg[0] != '+'){

290

argp_usage (state);

291

}

292

plus_options = arg;

430

293

break;

431

294

case ARGP_KEY_END:

432

295

break;

446

309

if (ret == ARGP_ERR_UNKNOWN){

447

310

fprintf(stderr, "Unknown error while parsing arguments\n");

448

311

exitstatus = EXIT_FAILURE;

449

goto fallback;

312

goto end;

450

313

}

451

452

conffp = fopen(argfile, "r");

453

if(conffp != NULL){

454

char *org_line = NULL;

455

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

456

size_t size = 0;

457

ssize_t sret;

458

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

459

const char comment_delim[] = "#";

460

461

custom_argc = 1;

462

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

463

if(custom_argv == NULL){

314

315

if(plus_options){

316

/* This is a mangled argument in the form of

317

"+--option+--other-option=parameter+--yet-another-option", etc */

318

/* Make new argc and argv vars, and call argp_parse() again. */

319

plus_options++; /* skip the first '+' character */

320

const char delims[] = "+";

321

char *arg;

322

int new_argc = 1;

323

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

324

if(plus_argv == NULL){

464

325

perror("malloc");

465

326

exitstatus = EXIT_FAILURE;

466

goto fallback;

467

}

468

custom_argv[0] = argv[0];

469

custom_argv[1] = NULL;

470

471

while(true){

472

sret = getline(&org_line, &size, conffp);

473

if(sret == -1){

474

break;

475

}

476

477

line = org_line;

478

arg = strsep(&line, comment_delim);

479

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

480

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

481

continue;

482

}

483

new_arg = strdup(p);

484

485

custom_argc += 1;

486

custom_argv = realloc(custom_argv, sizeof(char *)

487

* ((unsigned int) custom_argc + 1));

488

if(custom_argv == NULL){

489

perror("realloc");

490

exitstatus = EXIT_FAILURE;

491

free(org_line);

492

goto fallback;

493

}

494

custom_argv[custom_argc-1] = new_arg;

495

custom_argv[custom_argc] = NULL;

496

}

497

}

498

free(org_line);

499

} else{

500

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

501

not affect opening plugins */

502

if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){

503

perror("fopen");

504

exitstatus = EXIT_FAILURE;

505

goto fallback;

506

}

507

}

508

509

if(custom_argv != NULL){

510

ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);

327

goto end;

328

}

329

plus_argv[0] = argv[0];

330

plus_argv[1] = NULL;

331

arg = strtok(plus_options, delims); /* Get first argument */

332

while(arg != NULL){

333

new_argc++;

334

plus_argv = realloc(plus_argv, sizeof(char *)

335

* ((unsigned int) new_argc + 1));

336

if(plus_argv == NULL){

337

perror("realloc");

338

exitstatus = EXIT_FAILURE;

339

goto end;

340

}

341

plus_argv[new_argc-1] = arg;

342

plus_argv[new_argc] = NULL;

343

arg = strtok(NULL, delims); /* Get next argument */

344

}

345

ret = argp_parse (&argp, new_argc, plus_argv, 0, 0, &plugin_list);

511

346

if (ret == ARGP_ERR_UNKNOWN){

512

347

fprintf(stderr, "Unknown error while parsing arguments\n");

513

348

exitstatus = EXIT_FAILURE;

514

goto fallback;

349

goto end;

515

350

}

516

351

}

517

352

522

357

for(char **a = p->argv; *a != NULL; a++){

523

358

fprintf(stderr, "\tArg: %s\n", *a);

524

359

}

525

fprintf(stderr, "...and %u environment variables\n", p->envc);

526

for(char **a = p->environ; *a != NULL; a++){

527

fprintf(stderr, "\t%s\n", *a);

528

}

529

360

}

530

361

}

531

362

543

374

if(dir == NULL){

544

375

perror("Could not open plugin dir");

545

376

exitstatus = EXIT_FAILURE;

546

goto fallback;

377

goto end;

547

378

}

548

379

549

380

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

554

385

if(ret < 0){

555

386

perror("set_cloexec_flag");

556

387

exitstatus = EXIT_FAILURE;

557

goto fallback;

388

goto end;

558

389

}

559

390

}

560

391

}

569

400

if (errno == EBADF){

570

401

perror("readdir");

571

402

exitstatus = EXIT_FAILURE;

572

goto fallback;

403

goto end;

573

404

}

574

405

break;

575

406

}

620

451

continue;

621

452

}

622

453

}

623

624

char *filename;

625

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

626

if(ret < 0){

627

perror("asprintf");

628

continue;

454

455

char *filename = malloc(d_name_len + strlen(plugindir) + 2);

456

if (filename == NULL){

457

perror("malloc");

458

exitstatus = EXIT_FAILURE;

459

goto end;

629

460

}

461

strcpy(filename, plugindir); /* Spurious warning */

462

strcat(filename, "/"); /* Spurious warning */

463

strcat(filename, dirst->d_name); /* Spurious warning */

630

464

631

465

ret = stat(filename, &st);

632

466

if (ret == -1){

633

467

perror("stat");

634

free(filename);

635

continue;

468

exitstatus = EXIT_FAILURE;

469

goto end;

636

470

}

637

471

638

472

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

643

477

free(filename);

644

478

continue;

645

479

}

646

plugin *p = getplugin(dirst->d_name, &plugin_list);

647

if(p == NULL){

648

perror("getplugin");

649

free(filename);

650

continue;

651

}

652

if(p->disabled){

480

if(getplugin(dirst->d_name, &plugin_list)->disabled){

653

481

if(debug){

654

482

fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",

655

483

dirst->d_name);

657

485

free(filename);

658

486

continue;

659

487

}

488

plugin *p = getplugin(dirst->d_name, &plugin_list);

660

489

{

661

490

/* Add global arguments to argument list for this plugin */

662

491

plugin *g = getplugin(NULL, &plugin_list);

663

if(g != NULL){

664

for(char **a = g->argv + 1; *a != NULL; a++){

665

if(not add_argument(p, *a)){

666

perror("add_argument");

667

}

668

}

669

/* Add global environment variables */

670

for(char **e = g->environ; *e != NULL; e++){

671

if(not add_environment(p, *e)){

672

perror("add_environment");

673

}

674

}

675

}

676

}

677

/* If this plugin has any environment variables, we will call

678

using execve and need to duplicate the environment from this

679

process, too. */

680

if(p->environ[0] != NULL){

681

for(char **e = environ; *e != NULL; e++){

682

char *copy = strdup(*e);

683

if(copy == NULL){

684

perror("strdup");

685

continue;

686

}

687

if(not add_environment(p, copy)){

688

perror("add_environment");

689

}

690

}

691

}

692

693

int pipefd[2];

492

for(char **a = g->argv + 1; *a != NULL; a++){

493

addargument(p, *a);

494

}

495

}

496

int pipefd[2];

694

497

ret = pipe(pipefd);

695

498

if (ret == -1){

696

499

perror("pipe");

697

500

exitstatus = EXIT_FAILURE;

698

goto fallback;

501

goto end;

699

502

}

700

503

ret = set_cloexec_flag(pipefd[0]);

701

504

if(ret < 0){

702

505

perror("set_cloexec_flag");

703

506

exitstatus = EXIT_FAILURE;

704

goto fallback;

507

goto end;

705

508

}

706

509

ret = set_cloexec_flag(pipefd[1]);

707

510

if(ret < 0){

708

511

perror("set_cloexec_flag");

709

512

exitstatus = EXIT_FAILURE;

710

goto fallback;

513

goto end;

711

514

}

712

515

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

713

516

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

714

517

if(ret < 0){

715

518

perror("sigprocmask");

716

519

exitstatus = EXIT_FAILURE;

717

goto fallback;

520

goto end;

718

521

}

719

522

// Starting a new process to be watched

720

523

pid_t pid = fork();

721

if(pid == -1){

722

perror("fork");

723

exitstatus = EXIT_FAILURE;

724

goto fallback;

725

}

726

524

if(pid == 0){

727

525

/* this is the child process */

728

526

ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);

747

545

above and must now close it manually here. */

748

546

closedir(dir);

749

547

}

750

if(p->environ[0] == NULL){

751

if(execv(filename, p->argv) < 0){

752

perror("execv");

753

_exit(EXIT_FAILURE);

754

}

755

} else {

756

if(execve(filename, p->argv, p->environ) < 0){

757

perror("execve");

758

_exit(EXIT_FAILURE);

759

}

548

if(execv(filename, p->argv) < 0){

549

perror("execv");

550

_exit(EXIT_FAILURE);

760

551

}

761

552

/* no return */

762

553

}

771

562

perror("sigprocmask");

772

563

}

773

564

exitstatus = EXIT_FAILURE;

774

goto fallback;

565

goto end;

775

566

}

776

567

777

568

*new_process = (struct process){ .pid = pid,

785

576

if(ret < 0){

786

577

perror("sigprocmask");

787

578

exitstatus = EXIT_FAILURE;

788

goto fallback;

579

goto end;

789

580

}

790

581

791

582

FD_SET(new_process->fd, &rfds_all);

796

587

797

588

}

798

589

799

free_plugin_list(plugin_list);

800

plugin_list = NULL;

590

/* Free the plugin list */

591

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

592

next = plugin_list->next;

593

free(plugin_list->argv);

594

free(plugin_list);

595

}

801

596

802

597

closedir(dir);

803

598

dir = NULL;

813

608

if (select_ret == -1){

814

609

perror("select");

815

610

exitstatus = EXIT_FAILURE;

816

goto fallback;

611

goto end;

817

612

}

818

613

/* OK, now either a process completed, or something can be read

819

614

from one of them */

841

636

/* Remove the plugin */

842

637

FD_CLR(proc->fd, &rfds_all);

843

638

/* Block signal while modifying process_list */

844

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

639

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

845

640

if(ret < 0){

846

641

perror("sigprocmask");

847

642

exitstatus = EXIT_FAILURE;

848

goto fallback;

643

goto end;

849

644

}

850

645

/* Delete this process entry from the list */

851

646

if(process_list == proc){

875

670

}

876

671

/* This process exited nicely, so print its buffer */

877

672

878

bool bret = print_out_password(proc->buffer,

879

proc->buffer_length);

673

bool bret = print_out_password(proc->buffer, proc->buffer_length);

880

674

if(not bret){

881

675

perror("print_out_password");

882

676

exitstatus = EXIT_FAILURE;

883

677

}

884

goto fallback;

678

goto end;

885

679

}

886

680

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

887

681

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

895

689

if (proc->buffer == NULL){

896

690

perror("malloc");

897

691

exitstatus = EXIT_FAILURE;

898

goto fallback;

692

goto end;

899

693

}

900

694

proc->buffer_size += BUFFER_SIZE;

901

695

}

916

710

}

917

711

918

712

919

fallback:

713

end:

920

714

921

715

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

922

/* Fallback if all plugins failed, none are found or an error

923

occured */

716

/* Fallback if all plugins failed or an error occured */

924

717

bool bret;

925

718

fprintf(stderr, "Going to fallback mode using getpass(3)\n");

926

719

char *passwordbuffer = getpass("Password: ");

928

721

if(not bret){

929

722

perror("print_out_password");

930

723

exitstatus = EXIT_FAILURE;

724

goto end;

931

725

}

932

726

}

933

727

934

728

/* Restore old signal handler */

935

ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);

936

if(ret == -1){

937

perror("sigaction");

938

exitstatus = EXIT_FAILURE;

939

}

940

941

if(custom_argv != NULL){

942

for(char **arg = custom_argv+1; *arg != NULL; arg++){

943

free(*arg);

944

}

945

free(custom_argv);

946

}

947

free_plugin_list(plugin_list);

729

sigaction(SIGCHLD, &old_sigchld_action, NULL);

730

731

free(plus_argv);

732

733

/* Free the plugin list */

734

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

735

next = plugin_list->next;

736

free(plugin_list->argv);

737

free(plugin_list);

738

}

948

739

949

740

if(dir != NULL){

950

741

closedir(dir);