/mandos/release : revision 237.7.501

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to plugin-runner.c

Committer: Teddy Hogeborn
Date: 2018-08-19 01:35:11 UTC
mto: (237.7.594 trunk)
mto: This revision was merged to the branch mainline in revision 368.
Revision ID: teddy@recompile.se-20180819013511-cku25q9yeub3dnr0

Adapt to changes in cryptsetup; use "cryptroot-unlock" program

* Makefile (install-client-nokey): Also install new script files
  "mandos-to-cryptroot-unlock" and "initramfs-tools-script-stop".
* debian/mandos-client.dirs: Add
  "usr/share/initramfs-tools/scripts/local-premount".
* initramfs-tools-hook: Also copy "mandos-to-cryptroot-unlock".
* initramfs-tools-script: Only modify keyscript setting in cryptroot
  file if the file exists, otherwise start
  "mandos-to-cryptroot-unlock" in background.
* initramfs-tools-script-stop: New script to make sure plugin-runner
  has stopped before continuing.
* mandos-to-cryptroot-unlock: New script to run plugin-runner and feed
  any password it gets into the "cryptroot-unlock" program.

Show diffs side-by-side

added added

removed removed

plugin-runner.c

313

__attribute__((nonnull))

314

static void free_plugin(plugin *plugin_node){

315

316

free(plugin_node->name);

317

316

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

318

317

free(*arg);

319

318

}

584

583

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

585

584

break;

586

585

}

586

/* FALLTHROUGH */

587

default:

588

return ARGP_ERR_UNKNOWN;

589

}

1093

1094

new_plugin->pid = pid;

1095

new_plugin->fd = pipefd[0];

1096

1097

if(debug){

1098

fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",

1099

new_plugin->name, (intmax_t) (new_plugin->pid));

1100

}

1101

1097

1102

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

1098

1103

has already completed */

1099

1104

ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,

Older »