/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/password-request.c

  • Committer: Teddy Hogeborn
  • Date: 2008-08-12 23:13:41 UTC
  • mfrom: (24.1.48 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080812231341-2qd2xg3h3bkjthl2
* Makefile (COVERAGE): Change back to "--coverage".

* mandos-keygen: Implemented "--version" and "--help".

Show diffs side-by-side

added added

removed removed

Lines of Context:
682
682
      }
683
683
      int ret = start_mandos_communication(ip, port, interface, mc);
684
684
      if (ret == 0){
685
 
        exit(EXIT_SUCCESS);
 
685
        avahi_simple_poll_quit(mc->simple_poll);
686
686
      }
687
687
    }
688
688
  }
850
850
          break;
851
851
        case ARGP_KEY_ARG:
852
852
          argp_usage (state);
 
853
        case ARGP_KEY_END:
853
854
          break;
854
 
          case ARGP_KEY_END:
855
 
            break;
856
855
        default:
857
856
          return ARGP_ERR_UNKNOWN;
858
857
        }
865
864
                           " passwords from mandos server" };
866
865
      ret = argp_parse (&argp, argc, argv, 0, 0, NULL);
867
866
      if (ret == ARGP_ERR_UNKNOWN){
868
 
        fprintf(stderr, "Unkown error while parsing arguments\n");
 
867
        fprintf(stderr, "Unknown error while parsing arguments\n");
869
868
        exitcode = EXIT_FAILURE;
870
869
        goto end;
871
870
      }
881
880
    seckeyfile = combinepath(keydir, seckeyfile);
882
881
    if (seckeyfile == NULL){
883
882
      perror("combinepath");
 
883
      exitcode = EXIT_FAILURE;
884
884
      goto end;
885
885
    }
886
886
 
887
887
    ret = init_gnutls_global(&mc, pubkeyfile, seckeyfile);
888
888
    if (ret == -1){
889
 
      fprintf(stderr, "init_gnutls_global\n");
 
889
      fprintf(stderr, "init_gnutls_global failed\n");
 
890
      exitcode = EXIT_FAILURE;
890
891
      goto end;
891
892
    } else {
892
893
      gnutls_initalized = true;