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

* init.d-mandos: Bug fix: Correct the LSB header.

* mandos.xml (CHECKING): Add text about client disabling requiring
                         manual intervention to reverse.

* plugin-runner.c: Cast return value of TEMP_FAILURE_RETRY to "int"
                   where necessary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.conf.xml
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 "2015-04-02">
 
6
<!ENTITY TIMESTAMP "2009-02-25">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
20
20
        <firstname>Björn</firstname>
21
21
        <surname>Påhlsson</surname>
22
22
        <address>
23
 
          <email>belorn@recompile.se</email>
 
23
          <email>belorn@fukt.bsnet.se</email>
24
24
        </address>
25
25
      </author>
26
26
      <author>
27
27
        <firstname>Teddy</firstname>
28
28
        <surname>Hogeborn</surname>
29
29
        <address>
30
 
          <email>teddy@recompile.se</email>
 
30
          <email>teddy@fukt.bsnet.se</email>
31
31
        </address>
32
32
      </author>
33
33
    </authorgroup>
34
34
    <copyright>
35
35
      <year>2008</year>
36
36
      <year>2009</year>
37
 
      <year>2011</year>
38
 
      <year>2012</year>
39
 
      <year>2013</year>
40
37
      <holder>Teddy Hogeborn</holder>
41
38
      <holder>Björn Påhlsson</holder>
42
39
    </copyright>
121
118
        <term><option>priority<literal> = </literal><replaceable
122
119
        >STRING</replaceable></option></term>
123
120
        <listitem>
124
 
          <xi:include href="mandos-options.xml"
125
 
                      xpointer="priority_compat"/>
 
121
          <xi:include href="mandos-options.xml" xpointer="priority"/>
126
122
        </listitem>
127
123
      </varlistentry>
128
124
      
157
153
        </listitem>
158
154
      </varlistentry>
159
155
      
160
 
      <varlistentry>
161
 
        <term><option>restore<literal> = </literal>{ <literal
162
 
          >1</literal> | <literal>yes</literal> | <literal
163
 
          >true</literal> | <literal>on</literal> | <literal
164
 
          >0</literal> | <literal>no</literal> | <literal
165
 
          >false</literal> | <literal>off</literal> }</option></term>
166
 
        <listitem>
167
 
          <xi:include href="mandos-options.xml" xpointer="restore"/>
168
 
        </listitem>
169
 
      </varlistentry>
170
 
      
171
 
      <varlistentry>
172
 
        <term><option>statedir<literal> = </literal><replaceable
173
 
        >DIRECTORY</replaceable></option></term>
174
 
        <listitem>
175
 
          <xi:include href="mandos-options.xml" xpointer="statedir"/>
176
 
        </listitem>
177
 
      </varlistentry>
178
 
      
179
 
      <varlistentry>
180
 
        <term><option>socket<literal> = </literal><replaceable
181
 
        >NUMBER</replaceable></option></term>
182
 
        <listitem>
183
 
          <xi:include href="mandos-options.xml" xpointer="socket"/>
184
 
        </listitem>
185
 
      </varlistentry>
186
 
      
187
156
    </variablelist>
188
157
  </refsect1>
189
158
  
223
192
interface = eth0
224
193
address = fe80::aede:48ff:fe71:f6f2
225
194
port = 1025
226
 
debug = True
227
 
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA
 
195
debug = true
 
196
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
228
197
servicename = Daena
229
198
use_dbus = False
230
199
use_ipv6 = True
231
 
restore = True
232
 
statedir = /var/lib/mandos
233
200
      </programlisting>
234
201
    </informalexample>
235
202
  </refsect1>
237
204
  <refsect1 id="see_also">
238
205
    <title>SEE ALSO</title>
239
206
    <para>
240
 
      <citerefentry><refentrytitle>intro</refentrytitle>
241
 
      <manvolnum>8mandos</manvolnum></citerefentry>,
242
207
      <citerefentry><refentrytitle>gnutls_priority_init</refentrytitle
243
208
      ><manvolnum>3</manvolnum></citerefentry>,
244
209
      <citerefentry><refentrytitle>mandos</refentrytitle>