/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 plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2015-07-20 00:18:59 UTC
  • Revision ID: teddy@recompile.se-20150720001859-4373dkxokj7bt666
plugin-runner: Minor fix: close helperdir before exiting in fork.

* plugin-runner.c: Minor fix: close helperdir before exiting in fork
                   if helper program could not be opened.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
2288
2288
 
2289
2289
int main(int argc, char *argv[]){
2290
2290
  mandos_context mc = { .server = NULL, .dh_bits = 0,
2291
 
                        .priority = "SECURE256:!CTYPE-X.509"
2292
 
                        ":+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256",
2293
 
                        .current_server = NULL, .interfaces = NULL,
2294
 
                        .interfaces_size = 0 };
 
2291
                        .priority = "SECURE256:!CTYPE-X.509:"
 
2292
                        "+CTYPE-OPENPGP:!RSA", .current_server = NULL,
 
2293
                        .interfaces = NULL, .interfaces_size = 0 };
2295
2294
  AvahiSServiceBrowser *sb = NULL;
2296
2295
  error_t ret_errno;
2297
2296
  int ret;
2549
2548
        }
2550
2549
      }
2551
2550
      
2552
 
      if(dh_params_file != NULL
2553
 
         and strcmp(dh_params_file, PATHDIR "/dhparams.pem" ) == 0){
 
2551
      if(strcmp(dh_params_file, PATHDIR "/dhparams.pem" ) == 0){
2554
2552
        int dhparams_fd = open(dh_params_file, O_RDONLY);
2555
2553
        if(dhparams_fd == -1){
2556
2554
          perror_plus("open");