/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 mandos.conf.xml

  • Committer: Teddy Hogeborn
  • Date: 2016-06-03 18:24:51 UTC
  • Revision ID: teddy@recompile.se-20160603182451-l1hfhvi0wdf6sde1
mandos: Minor bug fix for Python 3

* mandos (ClientHandler.handle): The GnuTLS priority string needs to
                                 be encoded to a byte string

Reported-by: Valerio Bellizzomi <valerio@selnet.org>

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2013-10-23">
 
6
<!ENTITY TIMESTAMP "2016-03-05">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
34
34
    <copyright>
35
35
      <year>2008</year>
36
36
      <year>2009</year>
 
37
      <year>2010</year>
37
38
      <year>2011</year>
38
39
      <year>2012</year>
39
40
      <year>2013</year>
 
41
      <year>2014</year>
 
42
      <year>2015</year>
 
43
      <year>2016</year>
40
44
      <holder>Teddy Hogeborn</holder>
41
45
      <holder>Björn Påhlsson</holder>
42
46
    </copyright>
121
125
        <term><option>priority<literal> = </literal><replaceable
122
126
        >STRING</replaceable></option></term>
123
127
        <listitem>
124
 
          <xi:include href="mandos-options.xml"
125
 
                      xpointer="priority_compat"/>
 
128
          <xi:include href="mandos-options.xml" xpointer="priority"/>
126
129
        </listitem>
127
130
      </varlistentry>
128
131
      
201
204
      built-in module <systemitem class="library">ConfigParser</systemitem>
202
205
      requires it.
203
206
    </para>
 
207
    <xi:include href="bugs.xml"/>
204
208
  </refsect1>
205
209
  
206
210
  <refsect1 id="example">
223
227
interface = eth0
224
228
address = fe80::aede:48ff:fe71:f6f2
225
229
port = 1025
226
 
debug = true
227
 
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
 
230
debug = True
 
231
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA
228
232
servicename = Daena
229
233
use_dbus = False
230
234
use_ipv6 = True