/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-07-24 01:35:55 UTC
  • Revision ID: teddy@recompile.se-20140724013555-zrgds2ft5cmwhugb
Fix two mutually cancelling bugs.

* mandos (rfc3339_duration_to_delta): Set "token_duration" to be a
                                      token (and not a tuple) by
                                      removing the final comma.
                                      Construct the needed tuple later
                                      when initializing the
                                      "followers" variable.
* mandos-ctl (rfc3339_duration_to_delta): - '' -

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 "2018-02-08">
 
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
 
      <year>2016</year>
43
 
      <year>2017</year>
44
 
      <year>2018</year>
45
40
      <holder>Teddy Hogeborn</holder>
46
41
      <holder>Björn Påhlsson</holder>
47
42
    </copyright>
241
236
        <term><option>--priority <replaceable>
242
237
        PRIORITY</replaceable></option></term>
243
238
        <listitem>
244
 
          <xi:include href="mandos-options.xml" xpointer="priority"/>
 
239
          <xi:include href="mandos-options.xml"
 
240
                      xpointer="priority_compat"/>
245
241
        </listitem>
246
242
      </varlistentry>
247
243
      
544
540
        </listitem>
545
541
      </varlistentry>
546
542
      <varlistentry>
 
543
        <term><filename class="devicefile">/dev/log</filename></term>
 
544
      </varlistentry>
 
545
      <varlistentry>
547
546
        <term><filename
548
547
        class="directory">/var/lib/mandos</filename></term>
549
548
        <listitem>
555
554
        </listitem>
556
555
      </varlistentry>
557
556
      <varlistentry>
558
 
        <term><filename class="devicefile">/dev/log</filename></term>
 
557
        <term><filename>/dev/log</filename></term>
559
558
        <listitem>
560
559
          <para>
561
560
            The Unix domain socket to where local syslog messages are
590
589
      This server does not check the expire time of clients’ OpenPGP
591
590
      keys.
592
591
    </para>
593
 
    <xi:include href="bugs.xml"/>
594
592
  </refsect1>
595
593
  
596
594
  <refsect1 id="example">
709
707
      </varlistentry>
710
708
      <varlistentry>
711
709
        <term>
712
 
          <ulink url="https://gnutls.org/">GnuTLS</ulink>
 
710
          <ulink url="http://www.gnu.org/software/gnutls/"
 
711
          >GnuTLS</ulink>
713
712
        </term>
714
713
      <listitem>
715
714
        <para>
753
752
      </varlistentry>
754
753
      <varlistentry>
755
754
        <term>
756
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
757
 
          Protocol Version 1.2</citetitle>
 
755
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
756
          Protocol Version 1.1</citetitle>
758
757
        </term>
759
758
      <listitem>
760
759
        <para>
761
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
760
          TLS 1.1 is the protocol implemented by GnuTLS.
762
761
        </para>
763
762
      </listitem>
764
763
      </varlistentry>
774
773
      </varlistentry>
775
774
      <varlistentry>
776
775
        <term>
777
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
778
 
          Security (TLS) Authentication</citetitle>
 
776
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
 
777
          Security</citetitle>
779
778
        </term>
780
779
      <listitem>
781
780
        <para>