/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: 2009-01-15 05:27:55 UTC
  • mfrom: (237.2.9 mandos-release)
  • Revision ID: teddy@fukt.bsnet.se-20090115052755-luw0gjx8727p24o3
Merge from release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
838
838
    mandos_context mc = { .simple_poll = NULL, .server = NULL,
839
839
                          .dh_bits = 1024, .priority = "SECURE256"
840
840
                          ":!CTYPE-X.509:+CTYPE-OPENPGP" };
841
 
    bool gnutls_initialized = false;
842
 
    bool gpgme_initialized = false;
 
841
    bool gnutls_initalized = false;
 
842
    bool gpgme_initalized = false;
843
843
    
844
844
    {
845
845
      struct argp_option options[] = {
975
975
      exitcode = EXIT_FAILURE;
976
976
      goto end;
977
977
    } else {
978
 
      gnutls_initialized = true;
 
978
      gnutls_initalized = true;
979
979
    }
980
980
    
981
981
    if(mkdtemp(tempdir) == NULL){
985
985
    }
986
986
    
987
987
    if(not init_gpgme(&mc, pubkey, seckey, tempdir)){
988
 
      fprintf(stderr, "init_gpgme failed\n");
 
988
      fprintf(stderr, "gpgme_initalized failed\n");
989
989
      exitcode = EXIT_FAILURE;
990
990
      goto end;
991
991
    } else {
992
 
      gpgme_initialized = true;
 
992
      gpgme_initalized = true;
993
993
    }
994
994
    
995
995
    if_index = (AvahiIfIndex) if_nametoindex(interface);
1105
1105
    if(mc.simple_poll != NULL)
1106
1106
        avahi_simple_poll_free(mc.simple_poll);
1107
1107
    
1108
 
    if(gnutls_initialized){
 
1108
    if(gnutls_initalized){
1109
1109
      gnutls_certificate_free_credentials(mc.cred);
1110
1110
      gnutls_global_deinit();
1111
1111
      gnutls_dh_params_deinit(mc.dh_params);
1112
1112
    }
1113
1113
    
1114
 
    if(gpgme_initialized){
 
1114
    if(gpgme_initalized){
1115
1115
      gpgme_release(mc.ctx);
1116
1116
    }
1117
1117