/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-ctl.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-ctl.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-ctl">
5
 
<!ENTITY TIMESTAMP "2019-03-07">
 
5
<!ENTITY TIMESTAMP "2018-02-08">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
40
40
      <year>2016</year>
41
41
      <year>2017</year>
42
42
      <year>2018</year>
43
 
      <year>2019</year>
44
43
      <holder>Teddy Hogeborn</holder>
45
44
      <holder>Björn Påhlsson</holder>
46
45
    </copyright>
62
61
  <refsynopsisdiv>
63
62
    <cmdsynopsis>
64
63
      <command>&COMMANDNAME;</command>
65
 
      <group>
66
 
          <arg choice="plain"><option>--verbose</option></arg>
67
 
          <arg choice="plain"><option>-v</option></arg>
68
 
          <sbr/>
69
 
          <arg choice="plain"><option>--dump-json</option></arg>
70
 
          <arg choice="plain"><option>-j</option></arg>
71
 
      </group>
72
 
      <group>
73
 
        <arg rep='repeat' choice='plain'>
74
 
          <replaceable>CLIENT</replaceable>
75
 
        </arg>
76
 
      </group>
77
 
    </cmdsynopsis>
78
 
    <cmdsynopsis>
79
 
      <command>&COMMANDNAME;</command>
80
64
      <group choice="req">
81
65
        <group>
82
66
          <arg choice="plain"><option>--enable</option></arg>
93
77
        <sbr/>
94
78
        <group>
95
79
          <arg choice="plain"><option>--start-checker</option></arg>
 
80
        </group>
 
81
        <sbr/>
 
82
        <group>
96
83
          <arg choice="plain"><option>--stop-checker</option></arg>
97
84
        </group>
98
85
        <sbr/>
99
86
        <group>
 
87
          <arg choice="plain"><option>--remove</option></arg>
 
88
          <arg choice="plain"><option>-r</option></arg>
 
89
        </group>
 
90
        <sbr/>
 
91
        <group>
100
92
          <arg choice="plain"><option>--checker
101
93
          <replaceable>COMMAND</replaceable></option></arg>
102
94
          <arg choice="plain"><option>-c
140
132
        </group>
141
133
        <sbr/>
142
134
        <group>
 
135
          <arg choice="plain"><option>--interval
 
136
          <replaceable>TIME</replaceable></option></arg>
 
137
          <arg choice="plain"><option>-i
 
138
          <replaceable>TIME</replaceable></option></arg>
 
139
        </group>
 
140
        <sbr/>
 
141
        <group>
143
142
          <arg choice="plain"><option>--host
144
143
          <replaceable>STRING</replaceable></option></arg>
145
144
          <arg choice="plain"><option>-H
173
172
    <cmdsynopsis>
174
173
      <command>&COMMANDNAME;</command>
175
174
      <group>
176
 
        <arg choice="plain"><option>--deny</option></arg>
177
 
        <arg choice="plain"><option>-D</option></arg>
178
 
      </group>
179
 
      <group choice="req">
180
 
          <arg choice="plain"><option>--remove</option></arg>
181
 
          <arg choice="plain"><option>-r</option></arg>
182
 
      </group>
183
 
      <group choice="req">
184
 
        <arg choice="plain"><option>--all</option></arg>
185
 
        <arg choice="plain"><option>-a</option></arg>
 
175
          <arg choice="plain"><option>--verbose</option></arg>
 
176
          <arg choice="plain"><option>-v</option></arg>
 
177
          <sbr/>
 
178
          <arg choice="plain"><option>--dump-json</option></arg>
 
179
          <arg choice="plain"><option>-j</option></arg>
 
180
      </group>
 
181
      <group>
186
182
        <arg rep='repeat' choice='plain'>
187
183
          <replaceable>CLIENT</replaceable>
188
184
        </arg>
584
580
      <para>
585
581
 
586
582
<!-- do not wrap this line -->
587
 
<userinput>&COMMANDNAME; --timeout="PT5M" --interval="PT1M" foo1.example.org foo2.example.org</userinput>
 
583
<userinput>&COMMANDNAME; --timeout="5m" --interval="1m" foo1.example.org foo2.example.org</userinput>
588
584
 
589
585
      </para>
590
586
    </informalexample>