/mandos/release : revision 66

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

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

251

if (argv == NULL){

252

*argc = 1;

253

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

254

if(argv == NULL){

255

return NULL;

256

}

257

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

258

parsing */

259

argv[1] = NULL;

260

}

261

*argc += 1;

262

argv = realloc(argv, sizeof(char *)

263

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

264

if(argv == NULL){

265

return NULL;

266

}

267

argv[*argc-1] = arg;

268

argv[*argc] = NULL;

269

return argv;

270

}

271

272

static void free_plugin_list(plugin *plugin_list){

273

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

274

next = plugin_list->next;

275

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

276

free(*arg);

277

}

278

free(plugin_list->argv);

279

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

280

free(*env);

281

}

282

free(plugin_list->environ);

283

free(plugin_list);

284

}

285

}

286

287

188

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

288

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

289

const char *argfile = ARGFILE;

290

FILE *conffp;

189

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

291

190

size_t d_name_len;

292

191

DIR *dir = NULL;

293

192

struct dirent *dirst;

301

200

struct sigaction old_sigchld_action;

302

201

struct sigaction sigchld_action = { .sa_handler = handle_sigchld,

303

202

.sa_flags = SA_NOCLDSTOP };

304

char **custom_argv = NULL;

305

int custom_argc = 0;

306

203

char *plus_options = NULL;

204

char **plus_argv = NULL;

205

307

206

/* Establish a signal handler */

308

207

sigemptyset(&sigchld_action.sa_mask);

309

208

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

310

if(ret == -1){

209

if(ret < 0){

311

210

perror("sigaddset");

312

exitstatus = EXIT_FAILURE;

313

goto fallback;

211

exit(EXIT_FAILURE);

314

212

}

315

213

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

316

if(ret == -1){

214

if(ret < 0){

317

215

perror("sigaction");

318

exitstatus = EXIT_FAILURE;

319

goto fallback;

216

exit(EXIT_FAILURE);

320

217

}

321

218

322

219

/* The options we understand. */

324

221

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

325

222

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

326

223

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

327

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

328

.arg = "VAR=value",

329

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

330

224

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

331

225

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

332

226

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

333

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

334

.arg = "PLUGIN:ENV=value",

335

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

336

227

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

337

228

.arg = "PLUGIN",

338

229

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

357

248

switch (key) {

358

249

case 'g':

359

250

if (arg != NULL){

360

char *p;

361

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

362

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

363

continue;

364

}

365

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

366

perror("add_argument");

367

return ARGP_ERR_UNKNOWN;

368

}

369

}

370

}

371

break;

372

case 'e':

373

if(arg == NULL){

374

break;

375

}

376

{

377

char *envdef = strdup(arg);

378

if(envdef == NULL){

379

break;

380

}

381

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

382

perror("add_environment");

383

}

251

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

252

do{

253

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

254

p = strtok(NULL, ",");

255

} while (p != NULL);

384

256

}

385

257

break;

386

258

case 'o':

387

259

if (arg != NULL){

388

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

389

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

390

break;

391

}

392

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

393

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

394

break;

395

}

396

if(opt != NULL){

397

char *p;

398

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

399

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

400

continue;

401

}

402

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

403

perror("add_argument");

404

return ARGP_ERR_UNKNOWN;

405

}

406

}

407

}

408

}

409

break;

410

case 'f':

411

if(arg == NULL){

412

break;

413

}

414

{

415

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

416

if(envdef == NULL){

417

break;

418

}

419

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

420

if(p_name == NULL){

421

break;

422

}

423

envdef++;

424

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

425

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

426

268

}

427

269

}

428

270

break;

429

271

case 'd':

430

272

if (arg != NULL){

431

plugin *p = getplugin(arg, plugins);

432

if(p == NULL){

433

return ARGP_ERR_UNKNOWN;

434

}

435

p->disabled = true;

273

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

436

274

}

437

275

break;

438

276

case 128:

448

286

debug = true;

449

287

break;

450

288

case ARGP_KEY_ARG:

451

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;

452

293

break;

453

294

case ARGP_KEY_END:

454

295

break;

468

309

if (ret == ARGP_ERR_UNKNOWN){

469

310

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

470

311

exitstatus = EXIT_FAILURE;

471

goto fallback;

312

goto end;

472

313

}

473

474

conffp = fopen(argfile, "r");

475

if(conffp != NULL){

476

char *org_line = NULL;

477

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

478

size_t size = 0;

479

ssize_t sret;

480

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

481

const char comment_delim[] = "#";

482

483

while(true){

484

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

485

if(sret == -1){

486

break;

487

}

488

489

line = org_line;

490

arg = strsep(&line, comment_delim);

491

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

492

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

493

continue;

494

}

495

new_arg = strdup(p);

496

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

497

if (custom_argv == NULL){

498

perror("add_to_argv");

499

exitstatus = EXIT_FAILURE;

500

goto fallback;

501

}

502

}

503

}

504

free(org_line);

505

} else{

506

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

507

not affect opening plugins */

508

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

509

perror("fopen");

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){

325

perror("malloc");

510

326

exitstatus = EXIT_FAILURE;

511

goto fallback;

512

}

513

}

514

515

if(custom_argv != NULL){

516

custom_argv[0] = argv[0];

517

ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0,

518

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

519

346

if (ret == ARGP_ERR_UNKNOWN){

520

347

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

521

348

exitstatus = EXIT_FAILURE;

522

goto fallback;

349

goto end;

523

350

}

524

351

}

525

352

530

357

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

531

358

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

532

359

}

533

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

534

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

535

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

536

}

537

360

}

538

361

}

539

362

551

374

if(dir == NULL){

552

375

perror("Could not open plugin dir");

553

376

exitstatus = EXIT_FAILURE;

554

goto fallback;

377

goto end;

555

378

}

556

379

557

380

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

562

385

if(ret < 0){

563

386

perror("set_cloexec_flag");

564

387

exitstatus = EXIT_FAILURE;

565

goto fallback;

388

goto end;

566

389

}

567

390

}

568

391

}

577

400

if (errno == EBADF){

578

401

perror("readdir");

579

402

exitstatus = EXIT_FAILURE;

580

goto fallback;

403

goto end;

581

404

}

582

405

break;

583

406

}

628

451

continue;

629

452

}

630

453

}

631

632

char *filename;

633

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

634

if(ret < 0){

635

perror("asprintf");

636

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;

637

460

}

461

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

462

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

463

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

638

464

639

465

ret = stat(filename, &st);

640

466

if (ret == -1){

641

467

perror("stat");

642

free(filename);

643

continue;

468

exitstatus = EXIT_FAILURE;

469

goto end;

644

470

}

645

471

646

472

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

651

477

free(filename);

652

478

continue;

653

479

}

654

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

655

if(p == NULL){

656

perror("getplugin");

657

free(filename);

658

continue;

659

}

660

if(p->disabled){

480

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

661

481

if(debug){

662

482

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

663

483

dirst->d_name);

665

485

free(filename);

666

486

continue;

667

487

}

488

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

668

489

{

669

490

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

670

491

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

671

if(g != NULL){

672

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

673

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

674

perror("add_argument");

675

}

676

}

677

/* Add global environment variables */

678

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

679

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

680

perror("add_environment");

681

}

682

}

683

}

684

}

685

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

686

using execve and need to duplicate the environment from this

687

process, too. */

688

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

689

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

690

char *copy = strdup(*e);

691

if(copy == NULL){

692

perror("strdup");

693

continue;

694

}

695

if(not add_environment(p, copy)){

696

perror("add_environment");

697

}

698

}

699

}

700

701

int pipefd[2];

492

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

493

addargument(p, *a);

494

}

495

}

496

int pipefd[2];

702

497

ret = pipe(pipefd);

703

498

if (ret == -1){

704

499

perror("pipe");

705

500

exitstatus = EXIT_FAILURE;

706

goto fallback;

501

goto end;

707

502

}

708

503

ret = set_cloexec_flag(pipefd[0]);

709

504

if(ret < 0){

710

505

perror("set_cloexec_flag");

711

506

exitstatus = EXIT_FAILURE;

712

goto fallback;

507

goto end;

713

508

}

714

509

ret = set_cloexec_flag(pipefd[1]);

715

510

if(ret < 0){

716

511

perror("set_cloexec_flag");

717

512

exitstatus = EXIT_FAILURE;

718

goto fallback;

513

goto end;

719

514

}

720

515

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

721

516

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

722

517

if(ret < 0){

723

518

perror("sigprocmask");

724

519

exitstatus = EXIT_FAILURE;

725

goto fallback;

520

goto end;

726

521

}

727

522

// Starting a new process to be watched

728

523

pid_t pid = fork();

729

if(pid == -1){

730

perror("fork");

731

exitstatus = EXIT_FAILURE;

732

goto fallback;

733

}

734

524

if(pid == 0){

735

525

/* this is the child process */

736

526

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

755

545

above and must now close it manually here. */

756

546

closedir(dir);

757

547

}

758

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

759

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

760

perror("execv");

761

_exit(EXIT_FAILURE);

762

}

763

} else {

764

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

765

perror("execve");

766

_exit(EXIT_FAILURE);

767

}

548

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

549

perror("execv");

550

_exit(EXIT_FAILURE);

768

551

}

769

552

/* no return */

770

553

}

779

562

perror("sigprocmask");

780

563

}

781

564

exitstatus = EXIT_FAILURE;

782

goto fallback;

565

goto end;

783

566

}

784

567

785

568

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

793

576

if(ret < 0){

794

577

perror("sigprocmask");

795

578

exitstatus = EXIT_FAILURE;

796

goto fallback;

579

goto end;

797

580

}

798

581

799

582

FD_SET(new_process->fd, &rfds_all);

804

587

805

588

}

806

589

807

free_plugin_list(plugin_list);

808

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

}

809

596

810

597

closedir(dir);

811

598

dir = NULL;

821

608

if (select_ret == -1){

822

609

perror("select");

823

610

exitstatus = EXIT_FAILURE;

824

goto fallback;

611

goto end;

825

612

}

826

613

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

827

614

from one of them */

849

636

/* Remove the plugin */

850

637

FD_CLR(proc->fd, &rfds_all);

851

638

/* Block signal while modifying process_list */

852

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

639

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

853

640

if(ret < 0){

854

641

perror("sigprocmask");

855

642

exitstatus = EXIT_FAILURE;

856

goto fallback;

643

goto end;

857

644

}

858

645

/* Delete this process entry from the list */

859

646

if(process_list == proc){

883

670

}

884

671

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

885

672

886

bool bret = print_out_password(proc->buffer,

887

proc->buffer_length);

673

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

888

674

if(not bret){

889

675

perror("print_out_password");

890

676

exitstatus = EXIT_FAILURE;

891

677

}

892

goto fallback;

678

goto end;

893

679

}

894

680

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

895

681

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

903

689

if (proc->buffer == NULL){

904

690

perror("malloc");

905

691

exitstatus = EXIT_FAILURE;

906

goto fallback;

692

goto end;

907

693

}

908

694

proc->buffer_size += BUFFER_SIZE;

909

695

}

924

710

}

925

711

926

712

927

fallback:

713

end:

928

714

929

715

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

930

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

931

occured */

716

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

932

717

bool bret;

933

718

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

934

719

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

936

721

if(not bret){

937

722

perror("print_out_password");

938

723

exitstatus = EXIT_FAILURE;

724

goto end;

939

725

}

940

726

}

941

727

942

728

/* Restore old signal handler */

943

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

944

if(ret == -1){

945

perror("sigaction");

946

exitstatus = EXIT_FAILURE;

947

}

948

949

if(custom_argv != NULL){

950

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

951

free(*arg);

952

}

953

free(custom_argv);

954

}

955

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

}

956

739

957

740

if(dir != NULL){

958

741

closedir(dir);