/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

  • Committer: Teddy Hogeborn
  • Date: 2009-02-09 05:48:04 UTC
  • mfrom: (24.1.134 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090209054804-6phrjjrzjlpvuz7u
Merge from Björn:

* plugin-runner.c (main): Bug fix: For the "--options-for" option, do
                          not mangle arguments with colon characters.
                          Also support adding empty arguments.

* plugins.d/mandos-client.c: (mc): New global variable; moved from
                                   "main".
  (init_gpgme, pgp_packet_decrypt, init_gnutls_global,
  init_gnutls_session, start_mandos_communication): Removed "mc"
                                                    argument.  All
                                                    callers changed.

  (resolve_callback, browse_callback): Ignore "userdata" argument.
                                       All callers changed.
  (handle_sigterm): New function.
  (main): Add "handle_sigterm" as signal handler for SIGTERM before
          starting the main loop.

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 "2009-02-13">
 
6
<!ENTITY TIMESTAMP "2009-01-04">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
142
142
        </listitem>
143
143
      </varlistentry>
144
144
      
145
 
      <varlistentry>
146
 
        <term><option>use_ipv6<literal> = </literal>{ <literal
147
 
          >1</literal> | <literal>yes</literal> | <literal
148
 
          >true</literal> | <literal>on</literal> | <literal
149
 
          >0</literal> | <literal>no</literal> | <literal
150
 
          >false</literal> | <literal>off</literal> }</option></term>
151
 
        <listitem>
152
 
          <xi:include href="mandos-options.xml" xpointer="ipv6"/>
153
 
        </listitem>
154
 
      </varlistentry>
155
 
      
156
145
    </variablelist>
157
146
  </refsect1>
158
147
  
190
179
[DEFAULT]
191
180
# A configuration example
192
181
interface = eth0
193
 
address = fe80::aede:48ff:fe71:f6f2
 
182
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
194
183
port = 1025
195
184
debug = true
196
185
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
197
186
servicename = Daena
198
187
use_dbus = False
199
 
use_ipv6 = True
200
188
      </programlisting>
201
189
    </informalexample>
202
190
  </refsect1>