/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: 2019-02-11 10:57:53 UTC
  • Revision ID: teddy@recompile.se-20190211105753-ncbbfxxuzkxon67c
Fix Debian package dependency when using GnuTLS < 3.6.0

Work around what is probably a bug in dpkg-shlibdeps; it sees the
"libgnutls28-dev (>= 3.6.6) | libgnutls28-dev (<< 3.6.0)," in the
build-dependencies not as two alternatives, but as an absolute
dependency on libgnutls30 >= 3.6.6.  So if we compiled with
libgnutls30 << 3.6.0, we have to hide this build dependency.

* debian/rules (override_dh_shlibdeps-arch): New; conditionally edit
                                             debian/control before
                                             running dh_shlibdeps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.c
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();
567
568
    case -3:                    /* --usage */
568
569
      state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
569
570
      argp_state_help(state, state->out_stream,
570
571
                      ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
 
572
      __builtin_unreachable();
571
573
    case 'V':                   /* --version */
572
574
      fprintf(state->out_stream, "%s\n", argp_program_version);
573
575
      exit(EXIT_SUCCESS);
583
585
      if(arg[0] == '\0'){
584
586
        break;
585
587
      }
 
588
      /* FALLTHROUGH */
586
589
    default:
587
590
      return ARGP_ERR_UNKNOWN;
588
591
    }
1092
1095
    
1093
1096
    new_plugin->pid = pid;
1094
1097
    new_plugin->fd = pipefd[0];
1095
 
    
 
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
    /* Unblock SIGCHLD so signal handler can be run if this process
1097
1105
       has already completed */
1098
1106
    ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,