/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: 2010-09-26 17:36:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100926173630-zk7pe17fp2bv6zr7
* DBUS-API: Document new "LastApprovalRequest" client property.

* mandos (Client.last_approval_request): New attribute.
  (Client.need_approval): New method.
  (ClientDBus.need_approval): - '' -
  (ClientDBus.NeedApproval): Call self.need_approval().
  (ClientDBus.LastApprovalRequest_dbus_property): New D-Bus property.

* mandos-monitor: Show timeout counter during approval delay.
  (MandosClientWidget._update_timer_callback_lock): New.
  (MandosClientWidget.property_changed): Override to also call
                                         using_timer if
                                         ApprovalPending property is
                                         changed.
  (MandosClientWidget.using_timer): New method.
  (MandosClientWidget.checker_completed): Use "using_timer".
  (MandosClientWidget.need_approval): - '' -
  (MandosClientWidget.update): Show approval delay timer.

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-01-04">
 
6
<!ENTITY TIMESTAMP "2009-02-25">
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
      
145
156
    </variablelist>
146
157
  </refsect1>
147
158
  
179
190
[DEFAULT]
180
191
# A configuration example
181
192
interface = eth0
182
 
address = 2001:db8:f983:bd0b:30de:ae4a:71f2:f672
 
193
address = fe80::aede:48ff:fe71:f6f2
183
194
port = 1025
184
195
debug = true
185
196
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
186
197
servicename = Daena
187
198
use_dbus = False
 
199
use_ipv6 = True
188
200
      </programlisting>
189
201
    </informalexample>
190
202
  </refsect1>
225
237
              <para>
226
238
                The clients use IPv6 link-local addresses, which are
227
239
                immediately usable since a link-local addresses is
228
 
                automatically assigned to a network interfaces when it
 
240
                automatically assigned to a network interface when it
229
241
                is brought up.
230
242
              </para>
231
243
            </listitem>