← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnutls26/quantal

« back to all changes in this revision

Viewing changes to src/serv-gaa.h

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-05-20 13:07:18 UTC
  • mfrom: (12.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20110520130718-db41dybbanzfvlji
Tags: 2.10.5-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Fix build failure with --no-add-needed.
  - Build for multiarch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/serv-gaa.h
8
8
 
9
9
struct _gaainfo
10
10
{
 
11
#line 115 "serv.gaa"
 
12
        char *priorities;
11
13
#line 112 "serv.gaa"
12
 
        char *priorities;
13
 
#line 109 "serv.gaa"
14
14
        char **ctype;
 
15
#line 111 "serv.gaa"
 
16
        int nctype;
15
17
#line 108 "serv.gaa"
16
 
        int nctype;
17
 
#line 105 "serv.gaa"
18
18
        char **kx;
 
19
#line 107 "serv.gaa"
 
20
        int nkx;
19
21
#line 104 "serv.gaa"
20
 
        int nkx;
21
 
#line 101 "serv.gaa"
22
22
        char **macs;
 
23
#line 103 "serv.gaa"
 
24
        int nmacs;
23
25
#line 100 "serv.gaa"
24
 
        int nmacs;
25
 
#line 97 "serv.gaa"
26
26
        char **comp;
 
27
#line 99 "serv.gaa"
 
28
        int ncomp;
27
29
#line 96 "serv.gaa"
28
 
        int ncomp;
29
 
#line 93 "serv.gaa"
30
30
        char **proto;
 
31
#line 95 "serv.gaa"
 
32
        int nproto;
31
33
#line 92 "serv.gaa"
32
 
        int nproto;
33
 
#line 89 "serv.gaa"
34
34
        char **ciphers;
 
35
#line 91 "serv.gaa"
 
36
        int nciphers;
35
37
#line 88 "serv.gaa"
36
 
        int nciphers;
 
38
        char *opaque_prf_input;
37
39
#line 85 "serv.gaa"
38
 
        char *opaque_prf_input;
 
40
        char *srp_passwd_conf;
39
41
#line 82 "serv.gaa"
40
 
        char *srp_passwd_conf;
 
42
        char *srp_passwd;
41
43
#line 79 "serv.gaa"
42
 
        char *srp_passwd;
 
44
        char *psk_hint;
43
45
#line 76 "serv.gaa"
44
 
        char *psk_hint;
 
46
        char *psk_passwd;
45
47
#line 73 "serv.gaa"
46
 
        char *psk_passwd;
 
48
        int disable_client_cert;
47
49
#line 70 "serv.gaa"
48
 
        int disable_client_cert;
 
50
        int require_cert;
49
51
#line 67 "serv.gaa"
50
 
        int require_cert;
 
52
        char *x509_dsacertfile;
51
53
#line 64 "serv.gaa"
52
 
        char *x509_dsacertfile;
 
54
        char *x509_dsakeyfile;
53
55
#line 61 "serv.gaa"
54
 
        char *x509_dsakeyfile;
 
56
        char *x509_certfile;
55
57
#line 58 "serv.gaa"
56
 
        char *x509_certfile;
 
58
        char *x509_keyfile;
57
59
#line 55 "serv.gaa"
58
 
        char *x509_keyfile;
 
60
        char *pgp_subkey;
59
61
#line 52 "serv.gaa"
60
 
        char *pgp_subkey;
 
62
        char *pgp_certfile;
61
63
#line 49 "serv.gaa"
62
 
        char *pgp_certfile;
 
64
        char *pgp_keyfile;
63
65
#line 46 "serv.gaa"
64
 
        char *pgp_keyfile;
 
66
        char *pgp_keyring;
65
67
#line 43 "serv.gaa"
66
 
        char *pgp_keyring;
 
68
        char *x509_crlfile;
67
69
#line 40 "serv.gaa"
68
 
        char *x509_crlfile;
 
70
        char *x509_cafile;
69
71
#line 37 "serv.gaa"
70
 
        char *x509_cafile;
 
72
        int fmtder;
71
73
#line 34 "serv.gaa"
72
 
        int fmtder;
73
 
#line 31 "serv.gaa"
74
74
        char *dh_params_file;
 
75
#line 30 "serv.gaa"
 
76
        int http;
75
77
#line 27 "serv.gaa"
76
 
        int http;
 
78
        int noticket;
77
79
#line 24 "serv.gaa"
78
80
        int nodb;
79
81
#line 21 "serv.gaa"