/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: 2018-04-01 19:27:30 UTC
  • Revision ID: teddy@recompile.se-20180401192730-jwr4io5cb3x5u268
Don't print NULL string pointers in error message output

* plugins.d/mandos-client.c (pgp_packet_decrypt): If decryption fails,
  don't print unsupported_algorithm if it is NULL.

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 "2012-06-17">
 
5
<!ENTITY TIMESTAMP "2018-02-08">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
36
36
      <year>2010</year>
37
37
      <year>2011</year>
38
38
      <year>2012</year>
 
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
 
42
      <year>2016</year>
 
43
      <year>2017</year>
 
44
      <year>2018</year>
39
45
      <holder>Teddy Hogeborn</holder>
40
46
      <holder>Björn Påhlsson</holder>
41
47
    </copyright>
105
111
      <replaceable>FD</replaceable></option></arg>
106
112
      <sbr/>
107
113
      <arg><option>--foreground</option></arg>
 
114
      <sbr/>
 
115
      <arg><option>--no-zeroconf</option></arg>
108
116
    </cmdsynopsis>
109
117
    <cmdsynopsis>
110
118
      <command>&COMMANDNAME;</command>
321
329
        </listitem>
322
330
      </varlistentry>
323
331
      
 
332
      <varlistentry>
 
333
        <term><option>--no-zeroconf</option></term>
 
334
        <listitem>
 
335
          <xi:include href="mandos-options.xml" xpointer="zeroconf"/>
 
336
        </listitem>
 
337
      </varlistentry>
 
338
      
324
339
    </variablelist>
325
340
  </refsect1>
326
341
  
516
531
        </listitem>
517
532
      </varlistentry>
518
533
      <varlistentry>
519
 
        <term><filename>/var/run/mandos.pid</filename></term>
 
534
        <term><filename>/run/mandos.pid</filename></term>
520
535
        <listitem>
521
536
          <para>
522
537
            The file containing the process id of the
523
538
            <command>&COMMANDNAME;</command> process started last.
 
539
            <emphasis >Note:</emphasis> If the <filename
 
540
            class="directory">/run</filename> directory does not
 
541
            exist, <filename>/var/run/mandos.pid</filename> will be
 
542
            used instead.
524
543
          </para>
525
544
        </listitem>
526
545
      </varlistentry>
527
546
      <varlistentry>
528
 
        <term><filename class="devicefile">/dev/log</filename></term>
529
 
      </varlistentry>
530
 
      <varlistentry>
531
547
        <term><filename
532
548
        class="directory">/var/lib/mandos</filename></term>
533
549
        <listitem>
539
555
        </listitem>
540
556
      </varlistentry>
541
557
      <varlistentry>
542
 
        <term><filename>/dev/log</filename></term>
 
558
        <term><filename class="devicefile">/dev/log</filename></term>
543
559
        <listitem>
544
560
          <para>
545
561
            The Unix domain socket to where local syslog messages are
574
590
      This server does not check the expire time of clients’ OpenPGP
575
591
      keys.
576
592
    </para>
 
593
    <xi:include href="bugs.xml"/>
577
594
  </refsect1>
578
595
  
579
596
  <refsect1 id="example">
692
709
      </varlistentry>
693
710
      <varlistentry>
694
711
        <term>
695
 
          <ulink url="http://www.gnu.org/software/gnutls/"
696
 
          >GnuTLS</ulink>
 
712
          <ulink url="https://gnutls.org/">GnuTLS</ulink>
697
713
        </term>
698
714
      <listitem>
699
715
        <para>
737
753
      </varlistentry>
738
754
      <varlistentry>
739
755
        <term>
740
 
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
741
 
          Protocol Version 1.1</citetitle>
 
756
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
 
757
          Protocol Version 1.2</citetitle>
742
758
        </term>
743
759
      <listitem>
744
760
        <para>
745
 
          TLS 1.1 is the protocol implemented by GnuTLS.
 
761
          TLS 1.2 is the protocol implemented by GnuTLS.
746
762
        </para>
747
763
      </listitem>
748
764
      </varlistentry>
758
774
      </varlistentry>
759
775
      <varlistentry>
760
776
        <term>
761
 
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
762
 
          Security</citetitle>
 
777
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
778
          Security (TLS) Authentication</citetitle>
763
779
        </term>
764
780
      <listitem>
765
781
        <para>