/mandos/release : revision 24.1.61

21

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

22

*/

23

24

#define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */

25

24

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

25

asprintf() */

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> /* strtok, strlen(), strcpy(),

55

strcat() */

54

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

56

55

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

57

56

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

58

57

argp_state, struct argp,

65

64

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

66

65

67

66

#define BUFFER_SIZE 256

67

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

68

69

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

69

const char *argp_program_version = "plugin-runner 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;

90

92

bool disabled;

91

93

struct plugin *next;

92

94

} plugin;

101

103

/* Create a new plugin */

102

104

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

103

105

if (new_plugin == NULL){

104

perror("malloc");

105

exit(EXIT_FAILURE);

106

}

107

new_plugin->name = name;

106

return NULL;

107

}

108

char *copy_name = strdup(name);

109

if(copy_name == NULL){

110

return NULL;

111

}

112

113

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

114

.argc = 1,

115

.envc = 0,

116

.disabled = false,

117

.next = *plugin_list };

118

108

119

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

109

120

if (new_plugin->argv == NULL){

110

perror("malloc");

111

exit(EXIT_FAILURE);

121

free(new_plugin);

122

return NULL;

112

123

}

113

new_plugin->argv[0] = name;

124

new_plugin->argv[0] = copy_name;

114

125

new_plugin->argv[1] = NULL;

115

new_plugin->argc = 1;

116

new_plugin->disabled = false;

117

new_plugin->next = *plugin_list;

126

127

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

128

if(new_plugin->environ == NULL){

129

free(new_plugin->argv);

130

free(new_plugin);

131

return NULL;

132

}

133

new_plugin->environ[0] = NULL;

118

134

/* Append the new plugin to the list */

119

135

*plugin_list = new_plugin;

120

136

return new_plugin;

121

137

}

122

138

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

}

139

/* Helper function for add_argument and add_environment */

140

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

141

int *len){

142

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

143

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

144

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

145

/* Malloc check */

146

if(*array == NULL){

147

return false;

148

}

149

/* Make a copy of the new string */

150

char *copy = strdup(new);

151

if(copy == NULL){

152

return false;

153

}

154

/* Insert the copy */

155

(*array)[*len] = copy;

156

(*len)++;

157

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

158

(*array)[*len] = NULL;

159

return true;

160

}

161

162

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

163

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

164

if(p == NULL){

165

return false;

166

}

167

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

168

}

169

170

/* Add to a plugin's environment */

171

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

172

if(p == NULL){

173

return false;

174

}

175

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

176

}

177

133

178

134

179

/*

135

180

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

170

215

proc->completed = true;

171

216

}

172

217

218

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

219

ssize_t ret;

220

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

221

length--;

222

}

223

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

224

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

225

length - written));

226

if(ret < 0){

227

return false;

228

}

229

}

230

return true;

231

}

232

233

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

234

if (argv == NULL){

235

*argc = 1;

236

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

237

if(argv == NULL){

238

return NULL;

239

}

240

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

241

argv[1] = NULL;

242

}

243

*argc += 1;

244

argv = realloc(argv, sizeof(char *)

245

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

246

if(argv == NULL){

247

return NULL;

248

}

249

argv[*argc-1] = arg;

250

argv[*argc] = NULL;

251

return argv;

252

}

253

254

static void free_plugin_list(plugin *plugin_list){

255

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

256

next = plugin_list->next;

257

free(plugin_list->name);

258

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

259

free(*arg);

260

}

261

free(plugin_list->argv);

262

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

263

free(*env);

264

}

265

free(plugin_list->environ);

266

free(plugin_list);

267

}

268

}

269

173

270

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

174

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

271

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

272

const char *argfile = ARGFILE;

273

FILE *conffp;

175

274

size_t d_name_len;

176

275

DIR *dir = NULL;

177

276

struct dirent *dirst;

185

284

struct sigaction old_sigchld_action;

186

285

struct sigaction sigchld_action = { .sa_handler = handle_sigchld,

187

286

.sa_flags = SA_NOCLDSTOP };

188

char *plus_options = NULL;

189

char **plus_argv = NULL;

287

char **custom_argv = NULL;

288

int custom_argc = 0;

190

289

191

290

/* Establish a signal handler */

192

291

sigemptyset(&sigchld_action.sa_mask);

193

292

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

194

if(ret < 0){

293

if(ret == -1){

195

294

perror("sigaddset");

196

exit(EXIT_FAILURE);

295

exitstatus = EXIT_FAILURE;

296

goto fallback;

197

297

}

198

298

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

199

if(ret < 0){

299

if(ret == -1){

200

300

perror("sigaction");

201

exit(EXIT_FAILURE);

301

exitstatus = EXIT_FAILURE;

302

goto fallback;

202

303

}

203

304

204

305

/* The options we understand. */

206

307

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

207

308

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

208

309

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

310

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

311

.arg = "VAR=value",

312

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

209

313

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

210

314

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

211

315

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

316

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

317

.arg = "PLUGIN:ENV=value",

318

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

212

319

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

213

320

.arg = "PLUGIN",

214

321

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

233

340

switch (key) {

234

341

case 'g':

235

342

if (arg != NULL){

236

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

237

do{

238

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

239

p = strtok(NULL, ",");

240

} while (p != NULL);

343

char *p;

344

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

345

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

346

continue;

347

}

348

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

349

perror("add_argument");

350

return ARGP_ERR_UNKNOWN;

351

}

352

}

353

}

354

break;

355

case 'e':

356

if(arg == NULL){

357

break;

358

}

359

{

360

char *envdef = strdup(arg);

361

if(envdef == NULL){

362

break;

363

}

364

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

365

perror("add_environment");

366

}

241

367

}

242

368

break;

243

369

case 'o':

244

370

if (arg != NULL){

245

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

246

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

247

if(p != NULL){

248

p = strtok(p, ",");

249

do{

250

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

251

p = strtok(NULL, ",");

252

} while (p != NULL);

371

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

372

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

373

break;

374

}

375

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

376

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

377

break;

378

}

379

if(opt != NULL){

380

char *p;

381

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

382

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

383

continue;

384

}

385

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

386

perror("add_argument");

387

return ARGP_ERR_UNKNOWN;

388

}

389

}

390

}

391

}

392

break;

393

case 'f':

394

if(arg == NULL){

395

break;

396

}

397

{

398

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

399

if(envdef == NULL){

400

break;

401

}

402

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

403

if(p_name == NULL){

404

break;

405

}

406

envdef++;

407

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

408

perror("add_environment");

253

409

}

254

410

}

255

411

break;

256

412

case 'd':

257

413

if (arg != NULL){

258

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

414

plugin *p = getplugin(arg, plugins);

415

if(p == NULL){

416

return ARGP_ERR_UNKNOWN;

417

}

418

p->disabled = true;

259

419

}

260

420

break;

261

421

case 128:

271

431

debug = true;

272

432

break;

273

433

case ARGP_KEY_ARG:

274

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

275

argp_usage (state);

276

}

277

plus_options = arg;

434

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

278

435

break;

279

436

case ARGP_KEY_END:

280

437

break;

292

449

293

450

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

294

451

if (ret == ARGP_ERR_UNKNOWN){

295

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

452

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

296

453

exitstatus = EXIT_FAILURE;

297

goto end;

454

goto fallback;

298

455

}

299

300

if(plus_options){

301

/* This is a mangled argument in the form of

302

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

303

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

304

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

305

const char delims[] = "+";

306

char *arg;

307

int new_argc = 1;

308

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

309

if(plus_argv == NULL){

310

perror("malloc");

456

457

conffp = fopen(argfile, "r");

458

if(conffp != NULL){

459

char *org_line = NULL;

460

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

461

size_t size = 0;

462

ssize_t sret;

463

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

464

const char comment_delim[] = "#";

465

466

while(true){

467

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

468

if(sret == -1){

469

break;

470

}

471

472

line = org_line;

473

arg = strsep(&line, comment_delim);

474

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

475

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

476

continue;

477

}

478

new_arg = strdup(p);

479

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

480

if (custom_argv == NULL){

481

perror("add_to_argv");

482

exitstatus = EXIT_FAILURE;

483

goto fallback;

484

}

485

}

486

}

487

free(org_line);

488

} else{

489

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

490

not affect opening plugins */

491

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

492

perror("fopen");

311

493

exitstatus = EXIT_FAILURE;

312

goto end;

313

}

314

plus_argv[0] = argv[0];

315

plus_argv[1] = NULL;

316

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

317

while(arg != NULL){

318

new_argc++;

319

plus_argv = realloc(plus_argv, sizeof(char *)

320

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

321

if(plus_argv == NULL){

322

perror("realloc");

323

exitstatus = EXIT_FAILURE;

324

goto end;

325

}

326

plus_argv[new_argc-1] = arg;

327

plus_argv[new_argc] = NULL;

328

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

329

}

330

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

494

goto fallback;

495

}

496

}

497

498

if(custom_argv != NULL){

499

custom_argv[0] = argv[0];

500

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

331

501

if (ret == ARGP_ERR_UNKNOWN){

332

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

502

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

333

503

exitstatus = EXIT_FAILURE;

334

goto end;

504

goto fallback;

335

505

}

336

506

}

337

507

342

512

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

343

513

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

344

514

}

515

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

516

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

517

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

518

}

345

519

}

346

520

}

347

521

359

533

if(dir == NULL){

360

534

perror("Could not open plugin dir");

361

535

exitstatus = EXIT_FAILURE;

362

goto end;

536

goto fallback;

363

537

}

364

538

365

539

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

370

544

if(ret < 0){

371

545

perror("set_cloexec_flag");

372

546

exitstatus = EXIT_FAILURE;

373

goto end;

547

goto fallback;

374

548

}

375

549

}

376

550

}

385

559

if (errno == EBADF){

386

560

perror("readdir");

387

561

exitstatus = EXIT_FAILURE;

388

goto end;

562

goto fallback;

389

563

}

390

564

break;

391

565

}

436

610

continue;

437

611

}

438

612

}

439

440

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

441

if (filename == NULL){

442

perror("malloc");

443

exitstatus = EXIT_FAILURE;

444

goto end;

613

614

char *filename;

615

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

616

if(ret < 0){

617

perror("asprintf");

618

continue;

445

619

}

446

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

447

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

448

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

449

620

450

621

ret = stat(filename, &st);

451

622

if (ret == -1){

452

623

perror("stat");

453

exitstatus = EXIT_FAILURE;

454

goto end;

624

free(filename);

625

continue;

455

626

}

456

627

457

628

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

462

633

free(filename);

463

634

continue;

464

635

}

465

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

636

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

637

if(p == NULL){

638

perror("getplugin");

639

free(filename);

640

continue;

641

}

642

if(p->disabled){

466

643

if(debug){

467

644

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

468

645

dirst->d_name);

470

647

free(filename);

471

648

continue;

472

649

}

473

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

474

650

{

475

651

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

476

652

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

477

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

478

addargument(p, *a);

479

}

480

}

653

if(g != NULL){

654

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

655

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

656

perror("add_argument");

657

}

658

}

659

/* Add global environment variables */

660

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

661

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

662

perror("add_environment");

663

}

664

}

665

}

666

}

667

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

668

using execve and need to duplicate the environment from this

669

process, too. */

670

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

671

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

672

char *copy = strdup(*e);

673

if(copy == NULL){

674

perror("strdup");

675

continue;

676

}

677

if(not add_environment(p, copy)){

678

perror("add_environment");

679

}

680

}

681

}

682

481

683

int pipefd[2];

482

684

ret = pipe(pipefd);

483

685

if (ret == -1){

484

686

perror("pipe");

485

687

exitstatus = EXIT_FAILURE;

486

goto end;

688

goto fallback;

487

689

}

488

690

ret = set_cloexec_flag(pipefd[0]);

489

691

if(ret < 0){

490

692

perror("set_cloexec_flag");

491

693

exitstatus = EXIT_FAILURE;

492

goto end;

694

goto fallback;

493

695

}

494

696

ret = set_cloexec_flag(pipefd[1]);

495

697

if(ret < 0){

496

698

perror("set_cloexec_flag");

497

699

exitstatus = EXIT_FAILURE;

498

goto end;

700

goto fallback;

499

701

}

500

702

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

501

703

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

502

704

if(ret < 0){

503

705

perror("sigprocmask");

504

706

exitstatus = EXIT_FAILURE;

505

goto end;

707

goto fallback;

506

708

}

507

709

// Starting a new process to be watched

508

710

pid_t pid = fork();

711

if(pid == -1){

712

perror("fork");

713

exitstatus = EXIT_FAILURE;

714

goto fallback;

715

}

509

716

if(pid == 0){

510

717

/* this is the child process */

511

718

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

530

737

above and must now close it manually here. */

531

738

closedir(dir);

532

739

}

533

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

534

perror("execv");

535

_exit(EXIT_FAILURE);

740

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

741

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

742

perror("execv");

743

_exit(EXIT_FAILURE);

744

}

745

} else {

746

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

747

perror("execve");

748

_exit(EXIT_FAILURE);

749

}

536

750

}

537

751

/* no return */

538

752

}

547

761

perror("sigprocmask");

548

762

}

549

763

exitstatus = EXIT_FAILURE;

550

goto end;

764

goto fallback;

551

765

}

552

766

553

767

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

561

775

if(ret < 0){

562

776

perror("sigprocmask");

563

777

exitstatus = EXIT_FAILURE;

564

goto end;

778

goto fallback;

565

779

}

566

780

567

781

FD_SET(new_process->fd, &rfds_all);

572

786

573

787

}

574

788

575

/* Free the plugin list */

576

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

577

next = plugin_list->next;

578

free(plugin_list->argv);

579

free(plugin_list);

580

}

789

free_plugin_list(plugin_list);

581

790

582

791

closedir(dir);

583

792

dir = NULL;

584

793

585

794

if (process_list == NULL){

586

fprintf(stderr, "No plugin processes started, exiting\n");

587

exitstatus = EXIT_FAILURE;

588

goto end;

795

fprintf(stderr, "No plugin processes started. Incorrect plugin"

796

" directory?\n");

797

process_list = NULL;

589

798

}

590

799

while(process_list){

591

800

fd_set rfds = rfds_all;

593

802

if (select_ret == -1){

594

803

perror("select");

595

804

exitstatus = EXIT_FAILURE;

596

goto end;

805

goto fallback;

597

806

}

598

807

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

599

808

from one of them */

625

834

if(ret < 0){

626

835

perror("sigprocmask");

627

836

exitstatus = EXIT_FAILURE;

628

goto end;

837

goto fallback;

629

838

}

630

839

/* Delete this process entry from the list */

631

840

if(process_list == proc){

654

863

break;

655

864

}

656

865

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

657

for(size_t written = 0; written < proc->buffer_length;

658

written += (size_t)ret){

659

ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO,

660

proc->buffer + written,

661

proc->buffer_length

662

- written));

663

if(ret < 0){

664

perror("write");

665

exitstatus = EXIT_FAILURE;

666

goto end;

667

}

866

867

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

868

if(not bret){

869

perror("print_out_password");

870

exitstatus = EXIT_FAILURE;

668

871

}

669

goto end;

872

goto fallback;

670

873

}

671

874

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

672

875

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

680

883

if (proc->buffer == NULL){

681

884

perror("malloc");

682

885

exitstatus = EXIT_FAILURE;

683

goto end;

886

goto fallback;

684

887

}

685

888

proc->buffer_size += BUFFER_SIZE;

686

889

}

699

902

}

700

903

}

701

904

}

702

if(process_list == NULL){

703

fprintf(stderr, "All plugin processes failed, exiting\n");

704

exitstatus = EXIT_FAILURE;

905

906

907

fallback:

908

909

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

910

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

911

bool bret;

912

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

913

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

914

bret = print_out_password(passwordbuffer, strlen(passwordbuffer));

915

if(not bret){

916

perror("print_out_password");

917

exitstatus = EXIT_FAILURE;

918

}

705

919

}

706

920

707

end:

708

921

/* Restore old signal handler */

709

sigaction(SIGCHLD, &old_sigchld_action, NULL);

710

711

free(plus_argv);

712

713

/* Free the plugin list */

714

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

715

next = plugin_list->next;

716

free(plugin_list->argv);

717

free(plugin_list);

718

}

922

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

923

if(ret == -1){

924

perror("sigaction");

925

exitstatus = EXIT_FAILURE;

926

}

927

928

if(custom_argv != NULL){

929

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

930

free(*arg);

931

}

932

free(custom_argv);

933

}

934

free_plugin_list(plugin_list);

719

935

720

936

if(dir != NULL){

721

937

closedir(dir);