/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos.xml

  • Committer: Teddy Hogeborn
  • Date: 2017-02-22 21:45:35 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 358.
  • Revision ID: teddy@recompile.se-20170222214535-milf6w0b1krwpaex
http://bugs.debian.org/855589
Server bug fix: Use the mandos.conf "zeroconf" and "restore" options

Allow the "zeroconf" and "restore" options to actually work from the
mandos.conf file, in addition to command line options.

Closes: 855589
Reported-by: Pablo Abelenda <pabelenda@igalia.com>
Suggested-by: Pablo Abelenda <pabelenda@igalia.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.xml
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">
5
 
<!ENTITY TIMESTAMP "2015-01-25">
 
5
<!ENTITY TIMESTAMP "2016-07-03">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
39
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
 
42
      <year>2016</year>
40
43
      <holder>Teddy Hogeborn</holder>
41
44
      <holder>Björn Påhlsson</holder>
42
45
    </copyright>
236
239
        <term><option>--priority <replaceable>
237
240
        PRIORITY</replaceable></option></term>
238
241
        <listitem>
239
 
          <xi:include href="mandos-options.xml"
240
 
                      xpointer="priority_compat"/>
 
242
          <xi:include href="mandos-options.xml" xpointer="priority"/>
241
243
        </listitem>
242
244
      </varlistentry>
243
245
      
540
542
        </listitem>
541
543
      </varlistentry>
542
544
      <varlistentry>
543
 
        <term><filename class="devicefile">/dev/log</filename></term>
544
 
      </varlistentry>
545
 
      <varlistentry>
546
545
        <term><filename
547
546
        class="directory">/var/lib/mandos</filename></term>
548
547
        <listitem>
554
553
        </listitem>
555
554
      </varlistentry>
556
555
      <varlistentry>
557
 
        <term><filename>/dev/log</filename></term>
 
556
        <term><filename class="devicefile">/dev/log</filename></term>
558
557
        <listitem>
559
558
          <para>
560
559
            The Unix domain socket to where local syslog messages are
589
588
      This server does not check the expire time of clients’ OpenPGP
590
589
      keys.
591
590
    </para>
 
591
    <xi:include href="bugs.xml"/>
592
592
  </refsect1>
593
593
  
594
594
  <refsect1 id="example">
707
707
      </varlistentry>
708
708
      <varlistentry>
709
709
        <term>
710
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
710
          <ulink url="https://gnutls.org/">GnuTLS</ulink>
711
711
        </term>
712
712
      <listitem>
713
713
        <para>