/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

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.c
230
230
 | [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
231
231
 */
232
232
static int set_cloexec_flag(int fd){
233
 
  int ret = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
 
233
  int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
234
234
  /* If reading the flags failed, return error indication now. */
235
235
  if(ret < 0){
236
236
    return ret;
237
237
  }
238
238
  /* Store modified flag word in the descriptor. */
239
 
  return TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD, ret | FD_CLOEXEC));
 
239
  return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
 
240
                                       ret | FD_CLOEXEC));
240
241
}
241
242
 
242
243
 
788
789
    
789
790
    char *filename;
790
791
    if(plugindir == NULL){
791
 
      ret = TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
792
 
                                        dirst->d_name));
 
792
      ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
 
793
                                             dirst->d_name));
793
794
    } else {
794
 
      ret = TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s", plugindir,
795
 
                                        dirst->d_name));
 
795
      ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
 
796
                                             plugindir,
 
797
                                             dirst->d_name));
796
798
    }
797
799
    if(ret < 0){
798
800
      perror("asprintf");
799
801
      continue;
800
802
    }
801
803
    
802
 
    ret = TEMP_FAILURE_RETRY(stat(filename, &st));
 
804
    ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
803
805
    if(ret == -1){
804
806
      perror("stat");
805
807
      free(filename);
860
862
    }
861
863
    
862
864
    int pipefd[2];
863
 
    ret = TEMP_FAILURE_RETRY(pipe(pipefd));
 
865
    ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
864
866
    if(ret == -1){
865
867
      perror("pipe");
866
868
      exitstatus = EXIT_FAILURE;
880
882
      goto fallback;
881
883
    }
882
884
    /* Block SIGCHLD until process is safely in process list */
883
 
    ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
884
 
                                         &sigchld_action.sa_mask,
885
 
                                         NULL));
 
885
    ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
 
886
                                              &sigchld_action.sa_mask,
 
887
                                              NULL));
886
888
    if(ret < 0){
887
889
      perror("sigprocmask");
888
890
      exitstatus = EXIT_FAILURE;
942
944
    plugin *new_plugin = getplugin(dirst->d_name);
943
945
    if(new_plugin == NULL){
944
946
      perror("getplugin");
945
 
      ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
946
 
                                           &sigchld_action.sa_mask,
947
 
                                           NULL));
 
947
      ret = (int)(TEMP_FAILURE_RETRY
 
948
                  (sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
 
949
                               NULL)));
948
950
      if(ret < 0){
949
951
        perror("sigprocmask");
950
952
      }
957
959
    
958
960
    /* Unblock SIGCHLD so signal handler can be run if this process
959
961
       has already completed */
960
 
    ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
961
 
                                         &sigchld_action.sa_mask,
962
 
                                         NULL));
 
962
    ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
 
963
                                              &sigchld_action.sa_mask,
 
964
                                              NULL));
963
965
    if(ret < 0){
964
966
      perror("sigprocmask");
965
967
      exitstatus = EXIT_FAILURE;
966
968
      goto fallback;
967
969
    }
968
970
    
969
 
    FD_SET(new_plugin->fd, &rfds_all);
 
971
    FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
 
972
                                          -Wconversion */
970
973
    
971
974
    if(maxfd < new_plugin->fd){
972
975
      maxfd = new_plugin->fd;
1026
1029
          }
1027
1030
          
1028
1031
          /* Remove the plugin */
1029
 
          FD_CLR(proc->fd, &rfds_all);
 
1032
          FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
 
1033
                                          -Wconversion */
1030
1034
          
1031
1035
          /* Block signal while modifying process_list */
1032
 
          ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1033
 
                                               &sigchld_action.sa_mask,
1034
 
                                               NULL));
 
1036
          ret = (int)TEMP_FAILURE_RETRY(sigprocmask
 
1037
                                        (SIG_BLOCK,
 
1038
                                         &sigchld_action.sa_mask,
 
1039
                                         NULL));
1035
1040
          if(ret < 0){
1036
1041
            perror("sigprocmask");
1037
1042
            exitstatus = EXIT_FAILURE;
1043
1048
          proc = next_plugin;
1044
1049
          
1045
1050
          /* We are done modifying process list, so unblock signal */
1046
 
          ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1047
 
                                               &sigchld_action.sa_mask,
1048
 
                                               NULL));
 
1051
          ret = (int)(TEMP_FAILURE_RETRY
 
1052
                      (sigprocmask(SIG_UNBLOCK,
 
1053
                                   &sigchld_action.sa_mask, NULL)));
1049
1054
          if(ret < 0){
1050
1055
            perror("sigprocmask");
1051
1056
            exitstatus = EXIT_FAILURE;
1071
1076
      }
1072
1077
      
1073
1078
      /* This process has not completed.  Does it have any output? */
1074
 
      if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
 
1079
      if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
 
1080
                                                         warning from
 
1081
                                                         -Wconversion */
1075
1082
        /* This process had nothing to say at this time */
1076
1083
        proc = proc->next;
1077
1084
        continue;