/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.conf.xml

* mandos (Client.checked_ok): Set "expires" after setting timeout.
  (MultiprocessingMixIn.process_request): Return process object.
  (MultiprocessingMixInWithPipe.process_request): Receive proc object
                                                  and pass it to
                                                  add_pipe.  Do not
                                                  use super().
  (MultiprocessingMixInWithPipe.add_pipe): Take "proc" argument.  All
                                           callers changed.
  (MandosServer.add_pipe): Take "proc" argument.  All callers changed.
  (MandosServer.handle_ipc): Take "proc" argument.  All callers
                             changed.  Wait for process completion
                             when pipe closes.
  (main/cleanup): Remove any zombies.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2012-05-26">
 
6
<!ENTITY TIMESTAMP "2011-10-03">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
35
35
      <year>2008</year>
36
36
      <year>2009</year>
37
37
      <year>2011</year>
38
 
      <year>2012</year>
39
38
      <holder>Teddy Hogeborn</holder>
40
39
      <holder>Björn Påhlsson</holder>
41
40
    </copyright>
155
154
        </listitem>
156
155
      </varlistentry>
157
156
      
158
 
      <varlistentry>
159
 
        <term><option>restore<literal> = </literal>{ <literal
160
 
          >1</literal> | <literal>yes</literal> | <literal
161
 
          >true</literal> | <literal>on</literal> | <literal
162
 
          >0</literal> | <literal>no</literal> | <literal
163
 
          >false</literal> | <literal>off</literal> }</option></term>
164
 
        <listitem>
165
 
          <xi:include href="mandos-options.xml" xpointer="restore"/>
166
 
        </listitem>
167
 
      </varlistentry>
168
 
      
169
 
      <varlistentry>
170
 
        <term><option>statedir<literal> = </literal><replaceable
171
 
        >DIRECTORY</replaceable></option></term>
172
 
        <listitem>
173
 
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
174
 
        </listitem>
175
 
      </varlistentry>
176
 
      
177
 
      <varlistentry>
178
 
        <term><option>socket<literal> = </literal><replaceable
179
 
        >NUMBER</replaceable></option></term>
180
 
        <listitem>
181
 
          <xi:include href="mandos-options.xml" xpointer="socket"/>
182
 
        </listitem>
183
 
      </varlistentry>
184
 
      
185
157
    </variablelist>
186
158
  </refsect1>
187
159
  
226
198
servicename = Daena
227
199
use_dbus = False
228
200
use_ipv6 = True
229
 
restore = True
230
 
statedir = /var/lib/mandos
231
201
      </programlisting>
232
202
    </informalexample>
233
203
  </refsect1>