/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: 2014-07-16 23:44:54 UTC
  • Revision ID: teddy@recompile.se-20140716234454-6erpylmbf5qzndf3
mandos-client: Fix bug with GPGME 1.5.0.

* initramfs-tools-hook: If GPGME is 1.5.0 or later, copy "gpgconfig"
                        to RAM file system and do what GPGME does:
                        run "gpgconfig" to find GnuPG binary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
1650
1650
        _exit(EXIT_FAILURE);
1651
1651
      }
1652
1652
    } else {
1653
 
      if(hook_pid == -1){
1654
 
        perror_plus("fork");
1655
 
        free(direntry);
1656
 
        continue;
1657
 
      }
1658
1653
      int status;
1659
1654
      if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){
1660
1655
        perror_plus("waitpid");
1902
1897
int main(int argc, char *argv[]){
1903
1898
  mandos_context mc = { .server = NULL, .dh_bits = 1024,
1904
1899
                        .priority = "SECURE256:!CTYPE-X.509:"
1905
 
                        "+CTYPE-OPENPGP:!RSA", .current_server = NULL,
 
1900
                        "+CTYPE-OPENPGP", .current_server = NULL,
1906
1901
                        .interfaces = NULL, .interfaces_size = 0 };
1907
1902
  AvahiSServiceBrowser *sb = NULL;
1908
1903
  error_t ret_errno;