/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-09-02 17:42:53 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080902174253-p3wxrq7z6ccnv7fs
* plugins.d/password-request.c (main): Change default GnuTLS priority
                                       string to
                             "SECURE256":!CTYPE-X.509:+CTYPE-OPENPGP".

* plugins.d/password-request.xml (DESCRIPTION): Improve wording.
  (PURPOSE, OVERVIEW): New sections.
  (OPTIONS): Improved wording.
  (EXIT STATUS): Add text.
  (ENVIRONMENT): Commented out.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/password-request.c
774
774
    const char *pubkeyname = "pubkey.txt";
775
775
    const char *seckeyname = "seckey.txt";
776
776
    mandos_context mc = { .simple_poll = NULL, .server = NULL,
777
 
                          .dh_bits = 1024, .priority = "SECURE256"};
 
777
                          .dh_bits = 1024, .priority = "SECURE256"
 
778
                          ":!CTYPE-X.509:+CTYPE-OPENPGP" };
778
779
    bool gnutls_initalized = false;
779
780
    
780
781
    {
817
818
        /* Get the INPUT argument from `argp_parse', which we know is
818
819
           a pointer to our plugin list pointer. */
819
820
        switch (key) {
820
 
        case 128:
 
821
        case 128:               /* --debug */
821
822
          debug = true;
822
823
          break;
823
 
        case 'c':
 
824
        case 'c':               /* --connect */
824
825
          connect_to = arg;
825
826
          break;
826
 
        case 'i':
 
827
        case 'i':               /* --interface */
827
828
          interface = arg;
828
829
          break;
829
 
        case 'd':
 
830
        case 'd':               /* --keydir */
830
831
          keydir = arg;
831
832
          break;
832
 
        case 's':
 
833
        case 's':               /* --seckey */
833
834
          seckeyname = arg;
834
835
          break;
835
 
        case 'p':
 
836
        case 'p':               /* --pubkey */
836
837
          pubkeyname = arg;
837
838
          break;
838
 
        case 129:
 
839
        case 129:               /* --dh-bits */
839
840
          errno = 0;
840
841
          mc.dh_bits = (unsigned int) strtol(arg, NULL, 10);
841
842
          if (errno){
843
844
            exit(EXIT_FAILURE);
844
845
          }
845
846
          break;
846
 
        case 130:
 
847
        case 130:               /* --priority */
847
848
          mc.priority = arg;
848
849
          break;
849
850
        case ARGP_KEY_ARG: