/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: 2008-09-24 23:03:31 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080924230331-2qvhppypeo852ksr
* Makefile (PLUGINS): Added "plugins.d/usplash".
  (install-client-nokey): Add setuid bit on "plugins.d/usplash".

* plugins.d/splashy.c (main): Move "sret" to top.

* plugins.d/usplash: Removed.
* plugins.d/usplash.c: New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.c
846
846
        perror("sigaction");
847
847
        _exit(EXIT_FAILURE);
848
848
      }
849
 
      ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
 
849
      ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
850
850
      if(ret < 0){
851
851
        perror("sigprocmask");
852
852
        _exit(EXIT_FAILURE);
853
853
      }
854
 
      
 
854
 
855
855
      ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
856
856
      if(ret == -1){
857
857
        perror("dup2");
907
907
    if (maxfd < new_plugin->fd){
908
908
      maxfd = new_plugin->fd;
909
909
    }
 
910
    
910
911
  }
911
912
  
912
913
  closedir(dir);
913
914
  dir = NULL;
914
 
  
 
915
 
915
916
  for(plugin *p = plugin_list; p != NULL; p = p->next){
916
917
    if(p->pid != 0){
917
918
      break;
922
923
      free_plugin_list();
923
924
    }
924
925
  }
925
 
  
 
926
 
926
927
  /* Main loop while running plugins exist */
927
928
  while(plugin_list){
928
929
    fd_set rfds = rfds_all;
968
969
            goto fallback;
969
970
          }
970
971
          
971
 
          plugin *next_plugin = proc->next;
972
 
          free_plugin(proc);
973
 
          proc = next_plugin;
974
 
          
975
972
          /* We are done modifying process list, so unblock signal */
976
973
          ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
977
974
                             NULL);
985
982
            break;
986
983
          }
987
984
          
 
985
          plugin *next_plugin = proc->next;
 
986
          free_plugin(proc);
 
987
          proc = next_plugin;
988
988
          continue;
989
989
        }
990
990
        
991
991
        /* This process exited nicely, so print its buffer */
992
 
        
 
992
 
993
993
        bool bret = print_out_password(proc->buffer,
994
994
                                       proc->buffer_length);
995
995
        if(not bret){
1061
1061
    perror("sigaction");
1062
1062
    exitstatus = EXIT_FAILURE;
1063
1063
  }
1064
 
  
 
1064
 
1065
1065
  if(custom_argv != NULL){
1066
1066
    for(char **arg = custom_argv+1; *arg != NULL; arg++){
1067
1067
      free(*arg);
1073
1073
    closedir(dir);
1074
1074
  }
1075
1075
  
1076
 
  /* Kill the processes */
 
1076
  /* Free the process list and kill the processes */
1077
1077
  for(plugin *p = plugin_list; p != NULL; p = p->next){
1078
1078
    if(p->pid != 0){
1079
1079
      close(p->fd);
1092
1092
  if(errno != ECHILD){
1093
1093
    perror("wait");
1094
1094
  }
1095
 
  
 
1095
 
1096
1096
  free_plugin_list();
1097
1097
  
1098
1098
  free(plugindir);