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

  • Committer: Teddy Hogeborn
  • Date: 2016-02-21 12:43:51 UTC
  • Revision ID: teddy@recompile.se-20160221124351-3g9bc5eu90at8yis
plugin-runner.c: Use size_t to realloc() for custom plugin args.

* plugin-runner.c (main): Cast argument to realloc() to size_t when
                          allocating additional custom plugin command
                          line arguments.

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 "2019-02-10">
 
6
<!ENTITY TIMESTAMP "2015-07-20">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
40
40
      <year>2013</year>
41
41
      <year>2014</year>
42
42
      <year>2015</year>
43
 
      <year>2016</year>
44
 
      <year>2017</year>
45
 
      <year>2018</year>
46
 
      <year>2019</year>
47
43
      <holder>Teddy Hogeborn</holder>
48
44
      <holder>Björn Påhlsson</holder>
49
45
    </copyright>
187
183
            >--</option> %%(host)s</literal></quote>.  Note that
188
184
            <command>mandos-keygen</command>, when generating output
189
185
            to be inserted into this file, normally looks for an SSH
190
 
            server on the Mandos client, and, if it finds one, outputs
 
186
            server on the Mandos client, and, if it find one, outputs
191
187
            a <option>checker</option> option to check for the
192
 
            client’s SSH key fingerprint – this is more secure against
 
188
            client’s key fingerprint – this is more secure against
193
189
            spoofing.
194
190
          </para>
195
191
          <para>
228
224
        ><replaceable>HEXSTRING</replaceable></option></term>
229
225
        <listitem>
230
226
          <para>
231
 
            This option is <emphasis>required</emphasis> if the
232
 
            <option>key_id</option> is not set, and
233
 
            <emphasis>optional</emphasis> otherwise.
234
 
          </para>
235
 
          <para>
236
 
            This option sets the OpenPGP fingerprint that (before
237
 
            GnuTLS 3.6.0) identified the public key that clients
238
 
            authenticate themselves with through TLS.  The string
239
 
            needs to be in hexadecimal form, but spaces or upper/lower
240
 
            case are not significant.
241
 
          </para>
242
 
        </listitem>
243
 
      </varlistentry>
244
 
      
245
 
      <varlistentry>
246
 
        <term><option>key_id<literal> = </literal
247
 
        ><replaceable>HEXSTRING</replaceable></option></term>
248
 
        <listitem>
249
 
          <para>
250
 
            This option is <emphasis>required</emphasis> if the
251
 
            <option>fingerprint</option> is not set, and
252
 
            <emphasis>optional</emphasis> otherwise.
253
 
          </para>
254
 
          <para>
255
 
            This option sets the certificate key ID that (with GnuTLS
256
 
            3.6.6 or later) identifies the public key that clients
257
 
            authenticate themselves with through TLS.  The string
258
 
            needs to be in hexadecimal form, but spaces or upper/lower
259
 
            case are not significant.
 
227
            This option is <emphasis>required</emphasis>.
 
228
          </para>
 
229
          <para>
 
230
            This option sets the OpenPGP fingerprint that identifies
 
231
            the public key that clients authenticate themselves with
 
232
            through TLS.  The string needs to be in hexidecimal form,
 
233
            but spaces or upper/lower case are not significant.
260
234
          </para>
261
235
        </listitem>
262
236
      </varlistentry>
337
311
          <para>
338
312
            If present, this option must be set to a string of
339
313
            base64-encoded binary data.  It will be decoded and sent
340
 
            to the client matching the above <option>key_id</option>
341
 
            or <option>fingerprint</option>.  This should, of course,
342
 
            be OpenPGP encrypted data, decryptable only by the client.
 
314
            to the client matching the above
 
315
            <option>fingerprint</option>.  This should, of course, be
 
316
            OpenPGP encrypted data, decryptable only by the client.
343
317
            The program <citerefentry><refentrytitle><command
344
318
            >mandos-keygen</command></refentrytitle><manvolnum
345
319
            >8</manvolnum></citerefentry> can, using its
440
414
        <quote><literal>created</literal></quote>,
441
415
        <quote><literal>enabled</literal></quote>,
442
416
        <quote><literal>expires</literal></quote>,
443
 
        <quote><literal>key_id</literal></quote>,
444
417
        <quote><literal>fingerprint</literal></quote>,
445
418
        <quote><literal>host</literal></quote>,
446
419
        <quote><literal>interval</literal></quote>,
489
462
      <literal>%(<replaceable>foo</replaceable>)s</literal> is
490
463
      obscure.
491
464
    </para>
492
 
    <xi:include href="bugs.xml"/>
493
465
  </refsect1>
494
466
  
495
467
  <refsect1 id="example">
503
475
 
504
476
# Client "foo"
505
477
[foo]
506
 
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
507
478
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
508
479
secret =
509
480
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
526
497
 
527
498
# Client "bar"
528
499
[bar]
529
 
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
530
500
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
531
501
secfile = /etc/mandos/bar-secret
532
502
timeout = PT15M