/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: 2018-04-01 22:08:50 UTC
  • Revision ID: teddy@recompile.se-20180401220850-11kc7596lknn4piy
Check for and report GPGME key import errors

* plugins.d/mandos-client.c (init_gpgme/import_key): After
  gpgme_op_import(), call gpgme_op_import_result() to see if it
  worked.  If not, print all available information.

Show diffs side-by-side

added added

removed removed

Lines of Context:
564
564
    case '?':                   /* --help */
565
565
      state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
566
566
      argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
567
 
      __builtin_unreachable();
568
567
    case -3:                    /* --usage */
569
568
      state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
570
569
      argp_state_help(state, state->out_stream,
571
570
                      ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
572
 
      __builtin_unreachable();
573
571
    case 'V':                   /* --version */
574
572
      fprintf(state->out_stream, "%s\n", argp_program_version);
575
573
      exit(EXIT_SUCCESS);
1095
1093
    
1096
1094
    new_plugin->pid = pid;
1097
1095
    new_plugin->fd = pipefd[0];
1098
 
 
1099
 
    if(debug){
1100
 
      fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
1101
 
              new_plugin->name, (intmax_t) (new_plugin->pid));
1102
 
    }
1103
 
 
 
1096
    
1104
1097
    /* Unblock SIGCHLD so signal handler can be run if this process
1105
1098
       has already completed */
1106
1099
    ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,