/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: 2014-06-15 02:48:49 UTC
  • Revision ID: teddy@recompile.se-20140615024849-68x3q8g4yzadl33s
mandos: New "--no-zeroconf" option.  Also make "--socket=0" work.

* mandos (main): New "--no-zeroconf" option.  Also do not interpret
                 socket=0 as no socket.
* mandos-options.xml (zeroconf): New.
* mandos.conf (socket, zeroconf): New.
* mandos.xml (SYNOPSIS, OPTIONS): Added "--no-zeroconf".

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-12-06">
 
5
<!ENTITY TIMESTAMP "2014-06-15">
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
40
      <holder>Teddy Hogeborn</holder>
43
41
      <holder>Björn Påhlsson</holder>
44
42
    </copyright>
238
236
        <term><option>--priority <replaceable>
239
237
        PRIORITY</replaceable></option></term>
240
238
        <listitem>
241
 
          <xi:include href="mandos-options.xml" xpointer="priority"/>
 
239
          <xi:include href="mandos-options.xml"
 
240
                      xpointer="priority_compat"/>
242
241
        </listitem>
243
242
      </varlistentry>
244
243
      
541
540
        </listitem>
542
541
      </varlistentry>
543
542
      <varlistentry>
 
543
        <term><filename class="devicefile">/dev/log</filename></term>
 
544
      </varlistentry>
 
545
      <varlistentry>
544
546
        <term><filename
545
547
        class="directory">/var/lib/mandos</filename></term>
546
548
        <listitem>
552
554
        </listitem>
553
555
      </varlistentry>
554
556
      <varlistentry>
555
 
        <term><filename class="devicefile">/dev/log</filename></term>
 
557
        <term><filename>/dev/log</filename></term>
556
558
        <listitem>
557
559
          <para>
558
560
            The Unix domain socket to where local syslog messages are
705
707
      </varlistentry>
706
708
      <varlistentry>
707
709
        <term>
708
 
          <ulink url="http://gnutls.org/">GnuTLS</ulink>
 
710
          <ulink url="http://www.gnu.org/software/gnutls/"
 
711
          >GnuTLS</ulink>
709
712
        </term>
710
713
      <listitem>
711
714
        <para>
749
752
      </varlistentry>
750
753
      <varlistentry>
751
754
        <term>
752
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
753
 
          Protocol Version 1.2</citetitle>
 
755
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
756
          Protocol Version 1.1</citetitle>
754
757
        </term>
755
758
      <listitem>
756
759
        <para>
757
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
760
          TLS 1.1 is the protocol implemented by GnuTLS.
758
761
        </para>
759
762
      </listitem>
760
763
      </varlistentry>
770
773
      </varlistentry>
771
774
      <varlistentry>
772
775
        <term>
773
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
774
 
          Security (TLS) Authentication</citetitle>
 
776
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
777
          Security</citetitle>
775
778
        </term>
776
779
      <listitem>
777
780
        <para>