/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: 2015-08-10 07:34:37 UTC
  • Revision ID: teddy@recompile.se-20150810073437-3m8jgt13nqric6vf
Revert change to D-Bus API.

The D-Bus API signal CheckerCompleted is documented to provide a
wait(2) status value.  Since the server switched to using subprocess
to run checkers, it no longer has access to a wait(2) status value.  A
previous change to work around this made the D-Bus API incompatible.
Revert this change by constructing a fake wait(2) status value; this
keeps the D-Bus API stable.

* DBUS-API (CheckerCompleted): Revert incompatible change.
* mandos (ClientDBus.checker_callback): Construct fake wait(2) status.
* mandos-monitor (MandosClientWidget.checker_completed): Revert to
                                                         using
                                                         original API
                                                         with wait(2)
                                                         condition
                                                         value.

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-07-29">
 
5
<!ENTITY TIMESTAMP "2015-07-20">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
37
37
      <year>2013</year>
38
38
      <year>2014</year>
39
39
      <year>2015</year>
40
 
      <year>2016</year>
41
 
      <year>2017</year>
42
 
      <year>2018</year>
43
 
      <year>2019</year>
44
40
      <holder>Teddy Hogeborn</holder>
45
41
      <holder>Björn Påhlsson</holder>
46
42
    </copyright>
55
51
  <refnamediv>
56
52
    <refname><command>&COMMANDNAME;</command></refname>
57
53
    <refpurpose>
58
 
      Control or query the operation of the Mandos server
 
54
      Control the operation of the Mandos server
59
55
    </refpurpose>
60
56
  </refnamediv>
61
57
  
63
59
    <cmdsynopsis>
64
60
      <command>&COMMANDNAME;</command>
65
61
      <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
 
      <arg><option>--debug</option></arg>
73
 
      <group>
74
 
        <arg rep='repeat' choice='plain'>
75
 
          <replaceable>CLIENT</replaceable>
76
 
        </arg>
77
 
      </group>
78
 
    </cmdsynopsis>
79
 
    <cmdsynopsis>
80
 
      <command>&COMMANDNAME;</command>
81
 
      <group choice="req">
82
 
        <group>
83
 
          <arg choice="plain"><option>--enable</option></arg>
84
 
          <arg choice="plain"><option>-e</option></arg>
85
 
          <sbr/>
86
 
          <arg choice="plain"><option>--disable</option></arg>
87
 
          <arg choice="plain"><option>-d</option></arg>
88
 
        </group>
89
 
        <sbr/>
90
 
        <group>
91
 
          <arg choice="plain"><option>--bump-timeout</option></arg>
92
 
          <arg choice="plain"><option>-b</option></arg>
93
 
        </group>
94
 
        <sbr/>
95
 
        <group>
96
 
          <arg choice="plain"><option>--start-checker</option></arg>
97
 
          <arg choice="plain"><option>--stop-checker</option></arg>
98
 
        </group>
99
 
        <sbr/>
100
 
        <group>
101
 
          <arg choice="plain"><option>--checker
102
 
          <replaceable>COMMAND</replaceable></option></arg>
103
 
          <arg choice="plain"><option>-c
104
 
          <replaceable>COMMAND</replaceable></option></arg>
105
 
        </group>
106
 
        <sbr/>
107
 
        <group>
108
 
          <arg choice="plain"><option>--timeout
109
 
          <replaceable>TIME</replaceable></option></arg>
110
 
          <arg choice="plain"><option>-t
111
 
          <replaceable>TIME</replaceable></option></arg>
112
 
        </group>
113
 
        <sbr/>
114
 
        <group>
115
 
          <arg choice="plain"><option>--extended-timeout
116
 
          <replaceable>TIME</replaceable></option></arg>
117
 
        </group>
118
 
        <sbr/>
119
 
        <group>
120
 
          <arg choice="plain"><option>--interval
121
 
          <replaceable>TIME</replaceable></option></arg>
122
 
          <arg choice="plain"><option>-i
123
 
          <replaceable>TIME</replaceable></option></arg>
124
 
        </group>
125
 
        <sbr/>
126
 
        <group>
127
 
          <arg choice="plain"><option>--approve-by-default</option
128
 
          ></arg>
129
 
          <sbr/>
130
 
          <arg choice="plain"><option>--deny-by-default</option></arg>
131
 
        </group>
132
 
        <sbr/>
133
 
        <group>
134
 
          <arg choice="plain"><option>--approval-delay
135
 
          <replaceable>TIME</replaceable></option></arg>
136
 
        </group>
137
 
        <sbr/>
138
 
        <group>
139
 
          <arg choice="plain"><option>--approval-duration
140
 
          <replaceable>TIME</replaceable></option></arg>
141
 
        </group>
142
 
        <sbr/>
143
 
        <group>
144
 
          <arg choice="plain"><option>--host
145
 
          <replaceable>STRING</replaceable></option></arg>
146
 
          <arg choice="plain"><option>-H
147
 
          <replaceable>STRING</replaceable></option></arg>
148
 
        </group>
149
 
        <sbr/>
150
 
        <group>
151
 
          <arg choice="plain"><option>--secret
152
 
          <replaceable>FILENAME</replaceable></option></arg>
153
 
          <arg choice="plain"><option>-s
154
 
          <replaceable>FILENAME</replaceable></option></arg>
155
 
        </group>
156
 
        <sbr/>
157
 
        <group>
158
 
          <arg choice="plain"><option>--approve</option></arg>
159
 
          <arg choice="plain"><option>-A</option></arg>
160
 
          <sbr/>
161
 
          <arg choice="plain"><option>--deny</option></arg>
162
 
          <arg choice="plain"><option>-D</option></arg>
163
 
        </group>
164
 
      </group>
165
 
      <sbr/>
166
 
      <arg><option>--debug</option></arg>
167
 
      <group choice="req">
168
 
        <arg choice="plain"><option>--all</option></arg>
169
 
        <arg choice="plain"><option>-a</option></arg>
170
 
        <arg rep='repeat' choice='plain'>
171
 
          <replaceable>CLIENT</replaceable>
172
 
        </arg>
173
 
      </group>
174
 
    </cmdsynopsis>
175
 
    <cmdsynopsis>
176
 
      <command>&COMMANDNAME;</command>
177
 
      <group>
 
62
        <arg choice="plain"><option>--enable</option></arg>
 
63
        <arg choice="plain"><option>-e</option></arg>
 
64
        <sbr/>
 
65
        <arg choice="plain"><option>--disable</option></arg>
 
66
        <arg choice="plain"><option>-d</option></arg>
 
67
      </group>
 
68
      <sbr/>
 
69
      <group>
 
70
        <arg choice="plain"><option>--bump-timeout</option></arg>
 
71
        <arg choice="plain"><option>-b</option></arg>
 
72
      </group>
 
73
      <sbr/>
 
74
      <group>
 
75
        <arg choice="plain"><option>--start-checker</option></arg>
 
76
      </group>
 
77
      <sbr/>
 
78
      <group>
 
79
        <arg choice="plain"><option>--stop-checker</option></arg>
 
80
      </group>
 
81
      <sbr/>
 
82
      <group>
 
83
        <arg choice="plain"><option>--remove</option></arg>
 
84
        <arg choice="plain"><option>-r</option></arg>
 
85
      </group>
 
86
      <sbr/>
 
87
      <group>
 
88
        <arg choice="plain"><option>--checker
 
89
        <replaceable>COMMAND</replaceable></option></arg>
 
90
        <arg choice="plain"><option>-c
 
91
        <replaceable>COMMAND</replaceable></option></arg>
 
92
      </group>
 
93
      <sbr/>
 
94
      <group>
 
95
        <arg choice="plain"><option>--timeout
 
96
        <replaceable>TIME</replaceable></option></arg>
 
97
        <arg choice="plain"><option>-t
 
98
        <replaceable>TIME</replaceable></option></arg>
 
99
      </group>
 
100
      <sbr/>
 
101
      <group>
 
102
        <arg choice="plain"><option>--extended-timeout
 
103
        <replaceable>TIME</replaceable></option></arg>
 
104
      </group>
 
105
      <sbr/>
 
106
      <group>
 
107
        <arg choice="plain"><option>--interval
 
108
        <replaceable>TIME</replaceable></option></arg>
 
109
        <arg choice="plain"><option>-i
 
110
        <replaceable>TIME</replaceable></option></arg>
 
111
      </group>
 
112
      <sbr/>
 
113
      <group>
 
114
        <arg choice="plain"><option>--approve-by-default</option
 
115
        ></arg>
 
116
        <sbr/>
 
117
        <arg choice="plain"><option>--deny-by-default</option></arg>
 
118
      </group>
 
119
      <sbr/>
 
120
      <group>
 
121
        <arg choice="plain"><option>--approval-delay
 
122
        <replaceable>TIME</replaceable></option></arg>
 
123
      </group>
 
124
      <sbr/>
 
125
      <group>
 
126
        <arg choice="plain"><option>--approval-duration
 
127
        <replaceable>TIME</replaceable></option></arg>
 
128
      </group>
 
129
      <sbr/>
 
130
      <group>
 
131
        <arg choice="plain"><option>--interval
 
132
        <replaceable>TIME</replaceable></option></arg>
 
133
        <arg choice="plain"><option>-i
 
134
        <replaceable>TIME</replaceable></option></arg>
 
135
      </group>
 
136
      <sbr/>
 
137
      <group>
 
138
        <arg choice="plain"><option>--host
 
139
        <replaceable>STRING</replaceable></option></arg>
 
140
        <arg choice="plain"><option>-H
 
141
        <replaceable>STRING</replaceable></option></arg>
 
142
      </group>
 
143
      <sbr/>
 
144
      <group>
 
145
        <arg choice="plain"><option>--secret
 
146
        <replaceable>FILENAME</replaceable></option></arg>
 
147
        <arg choice="plain"><option>-s
 
148
        <replaceable>FILENAME</replaceable></option></arg>
 
149
      </group>
 
150
      <sbr/>
 
151
      <group>
 
152
        <arg choice="plain"><option>--approve</option></arg>
 
153
        <arg choice="plain"><option>-A</option></arg>
 
154
        <sbr/>
178
155
        <arg choice="plain"><option>--deny</option></arg>
179
156
        <arg choice="plain"><option>-D</option></arg>
180
157
      </group>
181
 
      <group choice="req">
182
 
          <arg choice="plain"><option>--remove</option></arg>
183
 
          <arg choice="plain"><option>-r</option></arg>
184
 
      </group>
185
158
      <sbr/>
186
 
      <arg><option>--debug</option></arg>
187
159
      <group choice="req">
188
160
        <arg choice="plain"><option>--all</option></arg>
189
161
        <arg choice="plain"><option>-a</option></arg>
194
166
    </cmdsynopsis>
195
167
    <cmdsynopsis>
196
168
      <command>&COMMANDNAME;</command>
 
169
      <group>
 
170
        <arg choice="plain"><option>--verbose</option></arg>
 
171
        <arg choice="plain"><option>-v</option></arg>
 
172
      </group>
 
173
      <group>
 
174
        <arg rep='repeat' choice='plain'>
 
175
          <replaceable>CLIENT</replaceable>
 
176
        </arg>
 
177
      </group>
 
178
    </cmdsynopsis>
 
179
    <cmdsynopsis>
 
180
      <command>&COMMANDNAME;</command>
197
181
      <group choice="req">
198
182
        <arg choice="plain"><option>--is-enabled</option></arg>
199
183
        <arg choice="plain"><option>-V</option></arg>
200
184
      </group>
201
 
      <arg><option>--debug</option></arg>
202
185
      <arg choice='plain'><replaceable>CLIENT</replaceable></arg>
203
186
    </cmdsynopsis>
204
187
    <cmdsynopsis>
224
207
  <refsect1 id="description">
225
208
    <title>DESCRIPTION</title>
226
209
    <para>
227
 
      <command>&COMMANDNAME;</command> is a program to control or
228
 
      query the operation of the Mandos server
229
 
      <citerefentry><refentrytitle>mandos</refentrytitle><manvolnum
230
 
      >8</manvolnum></citerefentry>.
 
210
      <command>&COMMANDNAME;</command> is a program to control the
 
211
      operation of the Mandos server <citerefentry><refentrytitle
 
212
      >mandos</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
231
213
    </para>
232
214
    <para>
233
215
      This program can be used to change client settings, approve or
491
473
      </varlistentry>
492
474
      
493
475
      <varlistentry>
494
 
        <term><option>--dump-json</option></term>
495
 
        <term><option>-j</option></term>
496
 
        <listitem>
497
 
          <para>
498
 
            Dump client settings as JSON to standard output.
499
 
          </para>
500
 
        </listitem>
501
 
      </varlistentry>
502
 
      
503
 
      <varlistentry>
504
476
        <term><option>--is-enabled</option></term>
505
477
        <term><option>-V</option></term>
506
478
        <listitem>
512
484
      </varlistentry>
513
485
      
514
486
      <varlistentry>
515
 
        <term><option>--debug</option></term>
516
 
        <listitem>
517
 
          <para>
518
 
            Show debug output; currently, this means show D-Bus calls.
519
 
          </para>
520
 
        </listitem>
521
 
      </varlistentry>
522
 
      
523
 
      <varlistentry>
524
487
        <term><option>--check</option></term>
525
488
        <listitem>
526
489
          <para>
550
513
    </para>
551
514
  </refsect1>
552
515
  
553
 
  <refsect1 id="bugs">
554
 
    <title>BUGS</title>
555
 
    <xi:include href="bugs.xml"/>
556
 
  </refsect1>
 
516
<!--   <refsect1 id="bugs"> -->
 
517
<!--     <title>BUGS</title> -->
 
518
<!--     <para> -->
 
519
<!--     </para> -->
 
520
<!--   </refsect1> -->
557
521
  
558
522
  <refsect1 id="example">
559
523
    <title>EXAMPLE</title>
560
 
    <!-- Name of test methods in class Test_commands_from_options are
561
 
         written in comments below.  When adding an example, add a
562
 
         test too which tests the documented behavior. -->
563
524
    <informalexample>
564
 
      <!-- Test method: test_manual_page_example_1() -->
565
525
      <para>
566
526
        To list all clients:
567
527
      </para>
571
531
    </informalexample>
572
532
    
573
533
    <informalexample>
574
 
      <!-- Test method: test_manual_page_example_2() -->
575
534
      <para>
576
535
        To list <emphasis>all</emphasis> settings for the clients
577
536
        named <quote>foo1.example.org</quote> and <quote
586
545
    </informalexample>
587
546
    
588
547
    <informalexample>
589
 
      <!-- Test method: test_manual_page_example_3() -->
590
548
      <para>
591
549
        To enable all clients:
592
550
      </para>
596
554
    </informalexample>
597
555
    
598
556
    <informalexample>
599
 
      <!-- Test method: test_manual_page_example_4() -->
600
557
      <para>
601
558
        To change timeout and interval value for the clients
602
559
        named <quote>foo1.example.org</quote> and <quote
605
562
      <para>
606
563
 
607
564
<!-- do not wrap this line -->
608
 
<userinput>&COMMANDNAME; --timeout=PT5M --interval=PT1M foo1.example.org foo2.example.org</userinput>
 
565
<userinput>&COMMANDNAME; --timeout="5m" --interval="1m" foo1.example.org foo2.example.org</userinput>
609
566
 
610
567
      </para>
611
568
    </informalexample>
612
569
    
613
570
    <informalexample>
614
 
      <!-- Test method: test_manual_page_example_5() -->
615
571
      <para>
616
 
        To approve all clients currently waiting for approval:
 
572
        To approve all clients currently waiting for it:
617
573
      </para>
618
574
      <para>
619
575
        <userinput>&COMMANDNAME; --approve --all</userinput>