/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to plugin-runner.c

  • Committer: Teddy Hogeborn
  • Date: 2019-02-11 10:57:53 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 382.
  • 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:
313
313
__attribute__((nonnull))
314
314
static void free_plugin(plugin *plugin_node){
315
315
  
316
 
  for(char **arg = (plugin_node->argv)+1; *arg != NULL; arg++){
 
316
  for(char **arg = plugin_node->argv; *arg != NULL; arg++){
317
317
    free(*arg);
318
318
  }
319
 
  free(plugin_node->name);
320
319
  free(plugin_node->argv);
321
320
  for(char **env = plugin_node->environ; *env != NULL; env++){
322
321
    free(*env);
586
585
      if(arg[0] == '\0'){
587
586
        break;
588
587
      }
589
 
#if __GNUC__ >= 7
590
 
      __attribute__((fallthrough));
591
 
#else
592
 
          /* FALLTHROUGH */
593
 
#endif
 
588
      /* FALLTHROUGH */
594
589
    default:
595
590
      return ARGP_ERR_UNKNOWN;
596
591
    }