/mandos/trunk : revision 63

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,

64

65

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

65

66

67

#define BUFFER_SIZE 256

67

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

68

69

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

69

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

70

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

71

72

struct process;

87

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

88

char **argv;

89

int argc;

90

char **environ;

91

int envc;

92

90

bool disabled;

93

91

struct plugin *next;

94

92

} plugin;

103

101

/* Create a new plugin */

104

102

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

105

103

if (new_plugin == NULL){

106

return NULL;

107

}

108

char *copy_name = NULL;

109

if(name != NULL){

110

copy_name = strdup(name);

111

if(copy_name == NULL){

112

return NULL;

113

}

114

}

115

116

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

117

.argc = 1,

118

.envc = 0,

119

.disabled = false,

120

.next = *plugin_list };

121

104

perror("malloc");

105

exit(EXIT_FAILURE);

106

}

107

new_plugin->name = name;

122

108

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

123

109

if (new_plugin->argv == NULL){

124

free(copy_name);

125

free(new_plugin);

126

return NULL;

110

perror("malloc");

111

exit(EXIT_FAILURE);

127

112

}

128

new_plugin->argv[0] = copy_name;

113

new_plugin->argv[0] = name;

129

114

new_plugin->argv[1] = NULL;

130

131

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

132

if(new_plugin->environ == NULL){

133

free(copy_name);

134

free(new_plugin->argv);

135

free(new_plugin);

136

return NULL;

137

}

138

new_plugin->environ[0] = NULL;

115

new_plugin->argc = 1;

116

new_plugin->disabled = false;

117

new_plugin->next = *plugin_list;

139

118

/* Append the new plugin to the list */

140

119

*plugin_list = new_plugin;

141

120

return new_plugin;

142

121

}

143

122

144

/* Helper function for add_argument and add_environment */

145

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

146

int *len){

147

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

148

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

149

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

150

/* Malloc check */

151

if(*array == NULL){

152

return false;

153

}

154

/* Make a copy of the new string */

155

char *copy = strdup(new);

156

if(copy == NULL){

157

return false;

158

}

159

/* Insert the copy */

160

(*array)[*len] = copy;

161

(*len)++;

162

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

163

(*array)[*len] = NULL;

164

return true;

165

}

166

167

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

168

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

169

if(p == NULL){

170

return false;

171

}

172

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

173

}

174

175

/* Add to a plugin's environment */

176

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

177

if(p == NULL){

178

return false;

179

}

180

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

181

}

182

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

}

183

133

184

134

/*

185

135

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

199

149

200

150

process *process_list = NULL;

201

151

202

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

152

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

203

153

status. */

204

154

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

205

155

process *proc = process_list;

206

while(true){

207

int status;

208

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

209

if(pid == 0){

210

break;

211

}

212

if(pid == -1){

213

if (errno != ECHILD){

214

perror("waitpid");

215

}

216

return;

217

}

218

219

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

220

proc = proc->next;

221

}

222

if(proc == NULL){

223

/* Process not found in process list */

224

continue;

225

}

226

proc->status = status;

227

proc->completed = true;

228

}

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;

229

171

}

230

172

231

173

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

232

ssize_t ret;

233

if(length>0 and buffer[length-1] == '\n'){

234

length--;

235

}

236

for(size_t written = 0; written < length; written += (size_t)ret){

174

size_t ret;

175

for(size_t written = 0; written < length; written += ret){

237

176

ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,

238

177

length - written));

239

178

if(ret < 0){

243

182

return true;

244

183

}

245

184

246

char **add_to_argv(char **argv, int *argc, char *arg){

247

if (argv == NULL){

248

*argc = 1;

249

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

250

if(argv == NULL){

251

return NULL;

252

}

253

argv[0] = NULL; /* Will be set to argv[0] in main before parsing */

254

argv[1] = NULL;

255

}

256

*argc += 1;

257

argv = realloc(argv, sizeof(char *)

258

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

259

if(argv == NULL){

260

return NULL;

261

}

262

argv[*argc-1] = arg;

263

argv[*argc] = NULL;

264

return argv;

265

}

266

267

static void free_plugin_list(plugin *plugin_list){

268

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

269

next = plugin_list->next;

270

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

271

free(*arg);

272

}

273

free(plugin_list->argv);

274

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

275

free(*env);

276

}

277

free(plugin_list->environ);

278

free(plugin_list);

279

}

280

}

281

282

185

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

283

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

284

const char *argfile = ARGFILE;

285

FILE *conffp;

186

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

286

187

size_t d_name_len;

287

188

DIR *dir = NULL;

288

189

struct dirent *dirst;

296

197

struct sigaction old_sigchld_action;

297

198

struct sigaction sigchld_action = { .sa_handler = handle_sigchld,

298

199

.sa_flags = SA_NOCLDSTOP };

299

char **custom_argv = NULL;

300

int custom_argc = 0;

200

char *plus_options = NULL;

201

char **plus_argv = NULL;

301

202

302

203

/* Establish a signal handler */

303

204

sigemptyset(&sigchld_action.sa_mask);

304

205

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

305

if(ret == -1){

206

if(ret < 0){

306

207

perror("sigaddset");

307

exitstatus = EXIT_FAILURE;

308

goto fallback;

208

exit(EXIT_FAILURE);

309

209

}

310

210

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

311

if(ret == -1){

211

if(ret < 0){

312

212

perror("sigaction");

313

exitstatus = EXIT_FAILURE;

314

goto fallback;

213

exit(EXIT_FAILURE);

315

214

}

316

215

317

216

/* The options we understand. */

319

218

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

320

219

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

321

220

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

322

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

323

.arg = "VAR=value",

324

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

325

221

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

326

222

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

327

223

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

328

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

329

.arg = "PLUGIN:ENV=value",

330

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

331

224

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

332

225

.arg = "PLUGIN",

333

226

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

352

245

switch (key) {

353

246

case 'g':

354

247

if (arg != NULL){

355

char *p;

356

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

357

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

358

continue;

359

}

360

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

361

perror("add_argument");

362

return ARGP_ERR_UNKNOWN;

363

}

364

}

365

}

366

break;

367

case 'e':

368

if(arg == NULL){

369

break;

370

}

371

{

372

char *envdef = strdup(arg);

373

if(envdef == NULL){

374

break;

375

}

376

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

377

perror("add_environment");

378

}

248

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

249

do{

250

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

251

p = strtok(NULL, ",");

252

} while (p != NULL);

379

253

}

380

254

break;

381

255

case 'o':

382

256

if (arg != NULL){

383

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

384

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

385

break;

386

}

387

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

388

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

389

break;

390

}

391

if(opt != NULL){

392

char *p;

393

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

394

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

395

continue;

396

}

397

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

398

perror("add_argument");

399

return ARGP_ERR_UNKNOWN;

400

}

401

}

402

}

403

}

404

break;

405

case 'f':

406

if(arg == NULL){

407

break;

408

}

409

{

410

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

411

if(envdef == NULL){

412

break;

413

}

414

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

415

if(p_name == NULL){

416

break;

417

}

418

envdef++;

419

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

420

perror("add_environment");

257

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

258

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

259

if(p != NULL){

260

p = strtok(p, ",");

261

do{

262

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

263

p = strtok(NULL, ",");

264

} while (p != NULL);

421

265

}

422

266

}

423

267

break;

424

268

case 'd':

425

269

if (arg != NULL){

426

plugin *p = getplugin(arg, plugins);

427

if(p == NULL){

428

return ARGP_ERR_UNKNOWN;

429

}

430

p->disabled = true;

270

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

431

271

}

432

272

break;

433

273

case 128:

443

283

debug = true;

444

284

break;

445

285

case ARGP_KEY_ARG:

446

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

286

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

287

argp_usage (state);

288

}

289

plus_options = arg;

447

290

break;

448

291

case ARGP_KEY_END:

449

292

break;

461

304

462

305

ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);

463

306

if (ret == ARGP_ERR_UNKNOWN){

464

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

307

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

465

308

exitstatus = EXIT_FAILURE;

466

goto fallback;

309

goto end;

467

310

}

468

469

conffp = fopen(argfile, "r");

470

if(conffp != NULL){

471

char *org_line = NULL;

472

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

473

size_t size = 0;

474

ssize_t sret;

475

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

476

const char comment_delim[] = "#";

477

478

while(true){

479

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

480

if(sret == -1){

481

break;

482

}

483

484

line = org_line;

485

arg = strsep(&line, comment_delim);

486

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

487

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

488

continue;

489

}

490

new_arg = strdup(p);

491

custom_argv = add_to_argv(custom_argv, &custom_argc, new_arg);

492

if (custom_argv == NULL){

493

perror("add_to_argv");

494

exitstatus = EXIT_FAILURE;

495

goto fallback;

496

}

497

}

498

}

499

free(org_line);

500

} else{

501

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

502

not affect opening plugins */

503

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

504

perror("fopen");

311

312

if(plus_options){

313

/* This is a mangled argument in the form of

314

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

315

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

316

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

317

const char delims[] = "+";

318

char *arg;

319

int new_argc = 1;

320

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

321

if(plus_argv == NULL){

322

perror("malloc");

505

323

exitstatus = EXIT_FAILURE;

506

goto fallback;

507

}

508

}

509

510

if(custom_argv != NULL){

511

custom_argv[0] = argv[0];

512

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

324

goto end;

325

}

326

plus_argv[0] = argv[0];

327

plus_argv[1] = NULL;

328

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

329

while(arg != NULL){

330

new_argc++;

331

plus_argv = realloc(plus_argv, sizeof(char *)

332

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

333

if(plus_argv == NULL){

334

perror("realloc");

335

exitstatus = EXIT_FAILURE;

336

goto end;

337

}

338

plus_argv[new_argc-1] = arg;

339

plus_argv[new_argc] = NULL;

340

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

341

}

342

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

513

343

if (ret == ARGP_ERR_UNKNOWN){

514

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

344

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

515

345

exitstatus = EXIT_FAILURE;

516

goto fallback;

346

goto end;

517

347

}

518

348

}

519

349

524

354

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

525

355

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

526

356

}

527

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

528

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

529

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

530

}

531

357

}

532

358

}

533

359

545

371

if(dir == NULL){

546

372

perror("Could not open plugin dir");

547

373

exitstatus = EXIT_FAILURE;

548

goto fallback;

374

goto end;

549

375

}

550

376

551

377

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

556

382

if(ret < 0){

557

383

perror("set_cloexec_flag");

558

384

exitstatus = EXIT_FAILURE;

559

goto fallback;

385

goto end;

560

386

}

561

387

}

562

388

}

571

397

if (errno == EBADF){

572

398

perror("readdir");

573

399

exitstatus = EXIT_FAILURE;

574

goto fallback;

400

goto end;

575

401

}

576

402

break;

577

403

}

622

448

continue;

623

449

}

624

450

}

625

626

char *filename;

627

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

628

if(ret < 0){

629

perror("asprintf");

630

continue;

451

452

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

453

if (filename == NULL){

454

perror("malloc");

455

exitstatus = EXIT_FAILURE;

456

goto end;

631

457

}

458

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

459

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

460

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

632

461

633

462

ret = stat(filename, &st);

634

463

if (ret == -1){

635

464

perror("stat");

636

free(filename);

637

continue;

465

exitstatus = EXIT_FAILURE;

466

goto end;

638

467

}

639

468

640

469

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

645

474

free(filename);

646

475

continue;

647

476

}

648

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

649

if(p == NULL){

650

perror("getplugin");

651

free(filename);

652

continue;

653

}

654

if(p->disabled){

477

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

655

478

if(debug){

656

479

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

657

480

dirst->d_name);

659

482

free(filename);

660

483

continue;

661

484

}

485

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

662

486

{

663

487

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

664

488

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

665

if(g != NULL){

666

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

667

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

668

perror("add_argument");

669

}

670

}

671

/* Add global environment variables */

672

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

673

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

674

perror("add_environment");

675

}

676

}

677

}

678

}

679

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

680

using execve and need to duplicate the environment from this

681

process, too. */

682

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

683

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

684

char *copy = strdup(*e);

685

if(copy == NULL){

686

perror("strdup");

687

continue;

688

}

689

if(not add_environment(p, copy)){

690

perror("add_environment");

691

}

692

}

693

}

694

695

int pipefd[2];

489

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

490

addargument(p, *a);

491

}

492

}

493

int pipefd[2];

696

494

ret = pipe(pipefd);

697

495

if (ret == -1){

698

496

perror("pipe");

699

497

exitstatus = EXIT_FAILURE;

700

goto fallback;

498

goto end;

701

499

}

702

500

ret = set_cloexec_flag(pipefd[0]);

703

501

if(ret < 0){

704

502

perror("set_cloexec_flag");

705

503

exitstatus = EXIT_FAILURE;

706

goto fallback;

504

goto end;

707

505

}

708

506

ret = set_cloexec_flag(pipefd[1]);

709

507

if(ret < 0){

710

508

perror("set_cloexec_flag");

711

509

exitstatus = EXIT_FAILURE;

712

goto fallback;

510

goto end;

713

511

}

714

512

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

715

513

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

716

514

if(ret < 0){

717

515

perror("sigprocmask");

718

516

exitstatus = EXIT_FAILURE;

719

goto fallback;

517

goto end;

720

518

}

721

519

// Starting a new process to be watched

722

520

pid_t pid = fork();

723

if(pid == -1){

724

perror("fork");

725

exitstatus = EXIT_FAILURE;

726

goto fallback;

727

}

728

521

if(pid == 0){

729

522

/* this is the child process */

730

523

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

749

542

above and must now close it manually here. */

750

543

closedir(dir);

751

544

}

752

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

753

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

754

perror("execv");

755

_exit(EXIT_FAILURE);

756

}

757

} else {

758

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

759

perror("execve");

760

_exit(EXIT_FAILURE);

761

}

545

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

546

perror("execv");

547

_exit(EXIT_FAILURE);

762

548

}

763

549

/* no return */

764

550

}

773

559

perror("sigprocmask");

774

560

}

775

561

exitstatus = EXIT_FAILURE;

776

goto fallback;

562

goto end;

777

563

}

778

564

779

565

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

787

573

if(ret < 0){

788

574

perror("sigprocmask");

789

575

exitstatus = EXIT_FAILURE;

790

goto fallback;

576

goto end;

791

577

}

792

578

793

579

FD_SET(new_process->fd, &rfds_all);

798

584

799

585

}

800

586

801

free_plugin_list(plugin_list);

802

plugin_list = NULL;

587

/* Free the plugin list */

588

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

589

next = plugin_list->next;

590

free(plugin_list->argv);

591

free(plugin_list);

592

}

803

593

804

594

closedir(dir);

805

595

dir = NULL;

815

605

if (select_ret == -1){

816

606

perror("select");

817

607

exitstatus = EXIT_FAILURE;

818

goto fallback;

608

goto end;

819

609

}

820

610

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

821

611

from one of them */

847

637

if(ret < 0){

848

638

perror("sigprocmask");

849

639

exitstatus = EXIT_FAILURE;

850

goto fallback;

640

goto end;

851

641

}

852

642

/* Delete this process entry from the list */

853

643

if(process_list == proc){

882

672

perror("print_out_password");

883

673

exitstatus = EXIT_FAILURE;

884

674

}

885

goto fallback;

675

goto end;

886

676

}

887

677

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

888

678

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

896

686

if (proc->buffer == NULL){

897

687

perror("malloc");

898

688

exitstatus = EXIT_FAILURE;

899

goto fallback;

689

goto end;

900

690

}

901

691

proc->buffer_size += BUFFER_SIZE;

902

692

}

915

705

}

916

706

}

917

707

}

918

919

920

fallback:

921

708

922

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

923

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

709

if(process_list == NULL){

924

710

bool bret;

925

711

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

926

712

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

928

714

if(not bret){

929

715

perror("print_out_password");

930

716

exitstatus = EXIT_FAILURE;

717

goto end;

718

}

719

bret = print_out_password("\n", 1);

720

if(not bret){

721

perror("print_out_password");

722

exitstatus = EXIT_FAILURE;

931

723

}

932

724

}

725

726

end:

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; *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);