/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-ctl.xml

  • Committer: Teddy Hogeborn
  • Date: 2017-02-22 21:45:35 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 358.
  • 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-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 "2016-06-27">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
38
38
      <year>2014</year>
39
39
      <year>2015</year>
40
40
      <year>2016</year>
41
 
      <year>2017</year>
42
 
      <year>2018</year>
43
 
      <year>2019</year>
44
41
      <holder>Teddy Hogeborn</holder>
45
42
      <holder>Björn Påhlsson</holder>
46
43
    </copyright>
78
75
        <sbr/>
79
76
        <group>
80
77
          <arg choice="plain"><option>--start-checker</option></arg>
 
78
        </group>
 
79
        <sbr/>
 
80
        <group>
81
81
          <arg choice="plain"><option>--stop-checker</option></arg>
82
82
        </group>
83
83
        <sbr/>
84
84
        <group>
 
85
          <arg choice="plain"><option>--remove</option></arg>
 
86
          <arg choice="plain"><option>-r</option></arg>
 
87
        </group>
 
88
        <sbr/>
 
89
        <group>
85
90
          <arg choice="plain"><option>--checker
86
91
          <replaceable>COMMAND</replaceable></option></arg>
87
92
          <arg choice="plain"><option>-c
125
130
        </group>
126
131
        <sbr/>
127
132
        <group>
 
133
          <arg choice="plain"><option>--interval
 
134
          <replaceable>TIME</replaceable></option></arg>
 
135
          <arg choice="plain"><option>-i
 
136
          <replaceable>TIME</replaceable></option></arg>
 
137
        </group>
 
138
        <sbr/>
 
139
        <group>
128
140
          <arg choice="plain"><option>--host
129
141
          <replaceable>STRING</replaceable></option></arg>
130
142
          <arg choice="plain"><option>-H
158
170
    <cmdsynopsis>
159
171
      <command>&COMMANDNAME;</command>
160
172
      <group>
161
 
        <arg choice="plain"><option>--deny</option></arg>
162
 
        <arg choice="plain"><option>-D</option></arg>
163
 
      </group>
164
 
      <group choice="req">
165
 
          <arg choice="plain"><option>--remove</option></arg>
166
 
          <arg choice="plain"><option>-r</option></arg>
167
 
      </group>
168
 
      <group choice="req">
169
 
        <arg choice="plain"><option>--all</option></arg>
170
 
        <arg choice="plain"><option>-a</option></arg>
171
 
        <arg rep='repeat' choice='plain'>
172
 
          <replaceable>CLIENT</replaceable>
173
 
        </arg>
174
 
      </group>
175
 
    </cmdsynopsis>
176
 
    <cmdsynopsis>
177
 
      <command>&COMMANDNAME;</command>
178
 
      <group>
179
173
          <arg choice="plain"><option>--verbose</option></arg>
180
174
          <arg choice="plain"><option>-v</option></arg>
181
175
          <sbr/>