/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-monitor.xml

  • Committer: Teddy Hogeborn
  • Date: 2016-03-09 21:23:21 UTC
  • Revision ID: teddy@recompile.se-20160309212321-2qlkzj9tecepc8xq
Server: Add Python 3 compatibility

Add Python 3 compatibility by not using the python-avahi module.  Also
fix miscellaneous things which differs in Python 3.  Especially hard
to fix is loading and saving clients data between Python 3 and 2,
since pickle formats have problems with strings.

* INSTALL: Remove python-avahi (and change python-gobject to
  python-gi, which is preferred now).
* debian/control (Source: mandos/Build-Depends-Indep): Remove
  "python-avahi".
* mandos: Wrap future_builtins import in try-except clause.  Do not
  import avahi module.  Use codecs.decode(..., "base64) instead of
  .decode("base64).  Use .keys(), .values(), and .items() instead of
  .iterkeys(), .itervalues(), and .iteritems().
  (alternate_dbus_interfaces/wrapper): Python 3 still requires the
  "black magic", but luckily it still works.  The Python 3 type()
  constructor requires first argument to be a string, not a byte
  string.
  (copy_function): New.  Use throughout.
  (Avahi, avahi): New class and global variable.
  (GnuTLS._need_version): Changed to be a byte string.
  (main): Decode byte strings loaded from pickle file.
  (main/cleanup): Dump using pickle prototoc 2 which Python 2 can
  read.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "mandos-monitor">
5
 
<!ENTITY TIMESTAMP "2010-09-14">
 
5
<!ENTITY TIMESTAMP "2016-03-05">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
19
19
        <firstname>Björn</firstname>
20
20
        <surname>Påhlsson</surname>
21
21
        <address>
22
 
          <email>belorn@fukt.bsnet.se</email>
 
22
          <email>belorn@recompile.se</email>
23
23
        </address>
24
24
      </author>
25
25
      <author>
26
26
        <firstname>Teddy</firstname>
27
27
        <surname>Hogeborn</surname>
28
28
        <address>
29
 
          <email>teddy@fukt.bsnet.se</email>
 
29
          <email>teddy@recompile.se</email>
30
30
        </address>
31
31
      </author>
32
32
    </authorgroup>
33
33
    <copyright>
34
34
      <year>2010</year>
 
35
      <year>2011</year>
 
36
      <year>2012</year>
 
37
      <year>2013</year>
 
38
      <year>2014</year>
 
39
      <year>2015</year>
 
40
      <year>2016</year>
35
41
      <holder>Teddy Hogeborn</holder>
36
42
      <holder>Björn Påhlsson</holder>
37
43
    </copyright>
127
133
        <entry>Toggle log window line wrap</entry>
128
134
      </row>
129
135
      <row>
 
136
        <entry>v</entry>
 
137
        <entry>Toggle verbose logging</entry>
 
138
      </row>
 
139
      <row>
130
140
        <entry>Up, Ctrl-P, k</entry>
131
141
        <entry>Move up a line</entry>
132
142
      </row>
189
199
    <title>BUGS</title>
190
200
    <para>
191
201
      This program can currently only be used to monitor and control a
192
 
      Mandos server with the default D-Bus service name of
193
 
      <quote>Mandos</quote>.
 
202
      Mandos server with the default D-Bus bus name of
 
203
      <quote>se.recompile.Mandos</quote>.
194
204
    </para>
 
205
    <xi:include href="bugs.xml"/>
195
206
  </refsect1>
196
207
  
197
208
  <refsect1 id="example">
218
229
  <refsect1 id="see_also">
219
230
    <title>SEE ALSO</title>
220
231
    <para>
 
232
      <citerefentry><refentrytitle>intro</refentrytitle>
 
233
      <manvolnum>8mandos</manvolnum></citerefentry>,
221
234
      <citerefentry><refentrytitle>mandos</refentrytitle>
222
235
      <manvolnum>8</manvolnum></citerefentry>,
223
236
      <citerefentry><refentrytitle>mandos-ctl</refentrytitle>