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

  • Committer: Teddy Hogeborn
  • Date: 2017-02-22 21:45:35 UTC
  • 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 "2013-10-20">
 
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>
106
109
      <replaceable>FD</replaceable></option></arg>
107
110
      <sbr/>
108
111
      <arg><option>--foreground</option></arg>
 
112
      <sbr/>
 
113
      <arg><option>--no-zeroconf</option></arg>
109
114
    </cmdsynopsis>
110
115
    <cmdsynopsis>
111
116
      <command>&COMMANDNAME;</command>
322
327
        </listitem>
323
328
      </varlistentry>
324
329
      
 
330
      <varlistentry>
 
331
        <term><option>--no-zeroconf</option></term>
 
332
        <listitem>
 
333
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
 
334
        </listitem>
 
335
      </varlistentry>
 
336
      
325
337
    </variablelist>
326
338
  </refsect1>
327
339
  
522
534
          <para>
523
535
            The file containing the process id of the
524
536
            <command>&COMMANDNAME;</command> process started last.
 
537
            <emphasis >Note:</emphasis> If the <filename
 
538
            class="directory">/run</filename> directory does not
 
539
            exist, <filename>/var/run/mandos.pid</filename> will be
 
540
            used instead.
525
541
          </para>
526
542
        </listitem>
527
543
      </varlistentry>
528
544
      <varlistentry>
529
 
        <term><filename class="devicefile">/dev/log</filename></term>
530
 
      </varlistentry>
531
 
      <varlistentry>
532
545
        <term><filename
533
546
        class="directory">/var/lib/mandos</filename></term>
534
547
        <listitem>
540
553
        </listitem>
541
554
      </varlistentry>
542
555
      <varlistentry>
543
 
        <term><filename>/dev/log</filename></term>
 
556
        <term><filename class="devicefile">/dev/log</filename></term>
544
557
        <listitem>
545
558
          <para>
546
559
            The Unix domain socket to where local syslog messages are
575
588
      This server does not check the expire time of clients’ OpenPGP
576
589
      keys.
577
590
    </para>
 
591
    <xi:include href="bugs.xml"/>
578
592
  </refsect1>
579
593
  
580
594
  <refsect1 id="example">
693
707
      </varlistentry>
694
708
      <varlistentry>
695
709
        <term>
696
 
          <ulink url="http://www.gnu.org/software/gnutls/"
697
 
          >GnuTLS</ulink>
 
710
          <ulink url="https://gnutls.org/">GnuTLS</ulink>
698
711
        </term>
699
712
      <listitem>
700
713
        <para>
738
751
      </varlistentry>
739
752
      <varlistentry>
740
753
        <term>
741
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
742
 
          Protocol Version 1.1</citetitle>
 
754
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
755
          Protocol Version 1.2</citetitle>
743
756
        </term>
744
757
      <listitem>
745
758
        <para>
746
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
759
          TLS 1.2 is the protocol implemented by GnuTLS.
747
760
        </para>
748
761
      </listitem>
749
762
      </varlistentry>
759
772
      </varlistentry>
760
773
      <varlistentry>
761
774
        <term>
762
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
763
 
          Security</citetitle>
 
775
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
776
          Security (TLS) Authentication</citetitle>
764
777
        </term>
765
778
      <listitem>
766
779
        <para>