/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: 2009-02-05 02:33:05 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090205023305-o7rkhr55e7w4pe1m
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
                             sig_atomic_t".  All uses changed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.c
115
115
  if(name != NULL){
116
116
    copy_name = strdup(name);
117
117
    if(copy_name == NULL){
 
118
      free(new_plugin);
118
119
      return NULL;
119
120
    }
120
121
  }
121
122
  
122
 
  *new_plugin = (plugin) { .name = copy_name,
123
 
                           .argc = 1,
124
 
                           .disabled = false,
125
 
                           .next = plugin_list };
 
123
  *new_plugin = (plugin){ .name = copy_name,
 
124
                          .argc = 1,
 
125
                          .disabled = false,
 
126
                          .next = plugin_list };
126
127
  
127
128
  new_plugin->argv = malloc(sizeof(char *) * 2);
128
129
  if(new_plugin->argv == NULL){
375
376
  };
376
377
  
377
378
  error_t parse_opt(int key, char *arg, __attribute__((unused))
378
 
                    struct argp_state *state) {
379
 
    switch(key) {
 
379
                    struct argp_state *state){
 
380
    switch(key){
380
381
    case 'g':                   /* --global-options */
381
382
      if(arg != NULL){
382
383
        char *p;
511
512
     ignores everything but the --config-file option. */
512
513
  error_t parse_opt_config_file(int key, char *arg,
513
514
                                __attribute__((unused))
514
 
                                struct argp_state *state) {
515
 
    switch(key) {
 
515
                                struct argp_state *state){
 
516
    switch(key){
516
517
    case 'g':                   /* --global-options */
517
518
    case 'G':                   /* --global-env */
518
519
    case 'o':                   /* --options-for */
969
970
              fprintf(stderr, "Plugin %" PRIdMAX " exited with status"
970
971
                      " %d\n", (intmax_t) (proc->pid),
971
972
                      WEXITSTATUS(proc->status));
972
 
            } else if(WIFSIGNALED(proc->status)) {
 
973
            } else if(WIFSIGNALED(proc->status)){
973
974
              fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"
974
975
                      " %d\n", (intmax_t) (proc->pid),
975
976
                      WTERMSIG(proc->status));