/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: 2019-09-01 04:27:59 UTC
  • Revision ID: teddy@recompile.se-20190901042759-dgadz8cg7x9y83ci
Fix minor Python 3 bytes/str mixups

* mandos (PGPEngine.__init__): Use byte string literals, not strings,
                               when working with byte strings.
  (main): When restoring persistent state from a file created by
          Python 2, also convert the "checker_command" setting from a
          byte string to a string, the same as "name" and "host".

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 "2017-02-23">
 
6
<!ENTITY TIMESTAMP "2019-06-20">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
42
42
      <year>2015</year>
43
43
      <year>2016</year>
44
44
      <year>2017</year>
 
45
      <year>2018</year>
 
46
      <year>2019</year>
45
47
      <holder>Teddy Hogeborn</holder>
46
48
      <holder>Björn Påhlsson</holder>
47
49
    </copyright>
225
227
      <programlisting>
226
228
[DEFAULT]
227
229
# A configuration example
228
 
interface = eth0
 
230
interface = enp1s0
229
231
address = fe80::aede:48ff:fe71:f6f2
230
232
port = 1025
231
233
debug = True
232
 
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA
 
234
priority = SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA:!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA
233
235
servicename = Daena
234
236
use_dbus = False
235
237
use_ipv6 = True