/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2014-06-08 02:31:50 UTC
  • Revision ID: teddy@recompile.se-20140608023150-eu8jxll7uddjxter
Bug fix for mandos-client: Run the network hook, not the directory.

* plugins.d/mandos-client.d (set_cloexec_flag): Removed.
  (run_network_hooks): Do not set O_CLOEXEC on "hookdir_fd".
                       Instead, open hook to new "hook_fd" and simply
                       close(hookdir_fd) before fexecve().

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
2253
2253
  
2254
2254
  /* If no interfaces were specified, make a list */
2255
2255
  if(mc.interfaces == NULL){
2256
 
    struct dirent **direntries = NULL;
 
2256
    struct dirent **direntries;
2257
2257
    /* Look for any good interfaces */
2258
2258
    ret = scandir(sys_class_net, &direntries, good_interface,
2259
2259
                  alphasort);
2591
2591
  /* Removes the GPGME temp directory and all files inside */
2592
2592
  if(tempdir != NULL){
2593
2593
    struct dirent **direntries = NULL;
2594
 
    int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY |
2595
 
                                                  O_NOFOLLOW));
 
2594
    int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY));
2596
2595
    if(tempdir_fd == -1){
2597
2596
      perror_plus("open");
2598
2597
    } else {