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

  • Committer: Teddy Hogeborn
  • Date: 2016-03-05 20:11:10 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 335.
  • Revision ID: teddy@recompile.se-20160305201110-6f7nws77k1h96e8k
errno is of type int, not error_t

* plugins.d/mandos-client.c (raise_privileges,
  raise_privileges_permanently, lower_privileges,
  lower_privileges_permanently, bring_up_interface,
  take_down_interface, ): Change return type and all errno-containing
  variables to type "int".
  (get_flags): Change all errno-containing variables to type "int".
  (main): Change all errno-containing variables to type "int", except
          for values which are explicitly of type error_t.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-clients.conf.xml
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos-clients.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/clients.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2012-05-27">
 
6
<!ENTITY TIMESTAMP "2016-02-28">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
37
37
      <year>2010</year>
38
38
      <year>2011</year>
39
39
      <year>2012</year>
 
40
      <year>2013</year>
 
41
      <year>2014</year>
 
42
      <year>2015</year>
 
43
      <year>2016</year>
40
44
      <holder>Teddy Hogeborn</holder>
41
45
      <holder>Björn Påhlsson</holder>
42
46
    </copyright>
117
121
          <para>
118
122
            How long to wait for external approval before resorting to
119
123
            use the <option>approved_by_default</option> value.  The
120
 
            default is <quote>0s</quote>, i.e. not to wait.
 
124
            default is <quote>PT0S</quote>, i.e. not to wait.
121
125
          </para>
122
126
          <para>
123
127
            The format of <replaceable>TIME</replaceable> is the same
177
181
            <varname>PATH</varname> will be searched.  The default
178
182
            value for the checker command is <quote><literal
179
183
            ><command>fping</command> <option>-q</option> <option
180
 
            >--</option> %%(host)s</literal></quote>.
 
184
            >--</option> %%(host)s</literal></quote>.  Note that
 
185
            <command>mandos-keygen</command>, when generating output
 
186
            to be inserted into this file, normally looks for an SSH
 
187
            server on the Mandos client, and, if it find one, outputs
 
188
            a <option>checker</option> option to check for the
 
189
            client’s key fingerprint – this is more secure against
 
190
            spoofing.
181
191
          </para>
182
192
          <para>
183
193
            In addition to normal start time expansion, this option
335
345
            <option>extended_timeout</option> option.
336
346
          </para>
337
347
          <para>
338
 
            The <replaceable>TIME</replaceable> is specified as a
339
 
            space-separated number of values, each of which is a
340
 
            number and a one-character suffix.  The suffix must be one
341
 
            of <quote>d</quote>, <quote>s</quote>, <quote>m</quote>,
342
 
            <quote>h</quote>, and <quote>w</quote> for days, seconds,
343
 
            minutes, hours, and weeks, respectively.  The values are
344
 
            added together to give the total time value, so all of
345
 
            <quote><literal>330s</literal></quote>,
346
 
            <quote><literal>110s 110s 110s</literal></quote>, and
347
 
            <quote><literal>5m 30s</literal></quote> will give a value
348
 
            of five minutes and thirty seconds.
 
348
            The <replaceable>TIME</replaceable> is specified as an RFC
 
349
            3339 duration; for example
 
350
            <quote><literal>P1Y2M3DT4H5M6S</literal></quote> meaning
 
351
            one year, two months, three days, four hours, five
 
352
            minutes, and six seconds.  Some values can be omitted, see
 
353
            RFC 3339 Appendix A for details.
349
354
          </para>
350
355
        </listitem>
351
356
      </varlistentry>
465
470
    <informalexample>
466
471
      <programlisting>
467
472
[DEFAULT]
468
 
timeout = 5m
469
 
interval = 2m
 
473
timeout = PT5M
 
474
interval = PT2M
470
475
checker = fping -q -- %%(host)s
471
476
 
472
477
# Client "foo"
489
494
        4T2zw4dxS5NswXWU0sVEXxjs6PYxuIiCTL7vdpx8QjBkrPWDrAbcMyBr2O
490
495
        QlnHIvPzEArRQLo=
491
496
host = foo.example.org
492
 
interval = 1m
 
497
interval = PT1M
493
498
 
494
499
# Client "bar"
495
500
[bar]
496
501
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
497
502
secfile = /etc/mandos/bar-secret
498
 
timeout = 15m
 
503
timeout = PT15M
499
504
approved_by_default = False
500
 
approval_delay = 30s
 
505
approval_delay = PT30S
501
506
      </programlisting>
502
507
    </informalexample>
503
508
  </refsect1>
516
521
      <citerefentry><refentrytitle>fping</refentrytitle>
517
522
      <manvolnum>8</manvolnum></citerefentry>
518
523
    </para>
 
524
    <variablelist>
 
525
      <varlistentry>
 
526
        <term>
 
527
          RFC 3339: <citetitle>Date and Time on the Internet:
 
528
          Timestamps</citetitle>
 
529
        </term>
 
530
      <listitem>
 
531
        <para>
 
532
          The time intervals are in the "duration" format, as
 
533
          specified in ABNF in Appendix A of RFC 3339.
 
534
        </para>
 
535
      </listitem>
 
536
      </varlistentry>
 
537
    </variablelist>
519
538
  </refsect1>
520
539
</refentry>
521
540
<!-- Local Variables: -->