/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 plugin-runner.c

  • Committer: Teddy Hogeborn
  • Date: 2014-03-29 05:16:37 UTC
  • Revision ID: teddy@recompile.se-20140329051637-abjokbmd5aptbf5u
Minor changes to minimize diff from last release.

* plugins.d/mandos-client.c: Minor changes (mostly white space).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.c
981
981
      exitstatus = EX_OSERR;
982
982
      goto fallback;
983
983
    }
984
 
    if(pipefd[0] >= FD_SETSIZE){
985
 
      fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
986
 
              FD_SETSIZE);
987
 
      TEMP_FAILURE_RETRY(close(pipefd[0]));
988
 
      TEMP_FAILURE_RETRY(close(pipefd[1]));
989
 
      exitstatus = EX_OSERR;
990
 
      goto fallback;
991
 
    }
992
984
    /* Ask OS to automatic close the pipe on exec */
993
985
    ret = set_cloexec_flag(pipefd[0]);
994
986
    if(ret < 0){
995
987
      error(0, errno, "set_cloexec_flag");
996
 
      TEMP_FAILURE_RETRY(close(pipefd[0]));
997
 
      TEMP_FAILURE_RETRY(close(pipefd[1]));
998
988
      exitstatus = EX_OSERR;
999
989
      goto fallback;
1000
990
    }
1001
991
    ret = set_cloexec_flag(pipefd[1]);
1002
992
    if(ret < 0){
1003
993
      error(0, errno, "set_cloexec_flag");
1004
 
      TEMP_FAILURE_RETRY(close(pipefd[0]));
1005
 
      TEMP_FAILURE_RETRY(close(pipefd[1]));
1006
994
      exitstatus = EX_OSERR;
1007
995
      goto fallback;
1008
996
    }
1022
1010
    } while(pid == -1 and errno == EINTR);
1023
1011
    if(pid == -1){
1024
1012
      error(0, errno, "fork");
1025
 
      TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1026
 
                                     &sigchld_action.sa_mask, NULL));
1027
 
      TEMP_FAILURE_RETRY(close(pipefd[0]));
1028
 
      TEMP_FAILURE_RETRY(close(pipefd[1]));
1029
1013
      exitstatus = EX_OSERR;
1030
1014
      goto fallback;
1031
1015
    }