/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 plugins.d/splashy.xml

  • Committer: Teddy Hogeborn
  • Date: 2024-11-15 11:02:39 UTC
  • Revision ID: teddy@recompile.se-20241115110239-1t2yh76c1ap7wlmm
mandos-keygen: Avoid comment lines from ssh-keyscan

In ssh-keyscan from OpenSSH 9.8, comment lines containing the hostname
and SSH protocol banner are emitted by to standard output.  Avoid this
by passing the "-q" (quiet) option to ssh-keyscan.

mandos-keygen: When scanning localhost for keys, try to run
"ssh-keyscan" both with and without the "-q" option.  If the "-q"
option worked, use the option also in the generated checker command.

Reported-By: bb <bb@tsufeki.eu>
Thanks: bb <bb@tsufeki.eu> for analysis

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/splashy.xml
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "splashy">
5
 
<!ENTITY TIMESTAMP "2011-10-03">
 
5
<!ENTITY TIMESTAMP "2019-02-10">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
33
33
    <copyright>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
 
36
      <year>2010</year>
36
37
      <year>2011</year>
 
38
      <year>2012</year>
 
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
 
42
      <year>2016</year>
 
43
      <year>2017</year>
 
44
      <year>2018</year>
 
45
      <year>2019</year>
37
46
      <holder>Teddy Hogeborn</holder>
38
47
      <holder>Björn Påhlsson</holder>
39
48
    </copyright>
126
135
        <para>
127
136
          These variables will normally be inherited from
128
137
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
129
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
130
 
          normally have inherited them from
131
 
          <filename>/scripts/local-top/cryptroot</filename> in the
132
 
          initial <acronym>RAM</acronym> disk environment, which will
133
 
          have set them from parsing kernel arguments and
134
 
          <filename>/conf/conf.d/cryptroot</filename> (also in the
135
 
          initial RAM disk environment), which in turn will have been
136
 
          created when the initial RAM disk image was created by
137
 
          <filename
138
 
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
139
 
          extracting the information of the root file system from
140
 
          <filename >/etc/crypttab</filename>.
 
138
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
 
139
          have in turn inherited them from its calling process.
141
140
        </para>
142
141
        <para>
143
142
          This behavior is meant to exactly mirror the behavior of
203
202
      is ugly, but necessary as long as it does not support aborting a
204
203
      password request.
205
204
    </para>
 
205
    <xi:include href="../bugs.xml"/>
206
206
  </refsect1>
207
207
  
208
208
  <refsect1 id="example">
266
266
    <para>
267
267
      <citerefentry><refentrytitle>intro</refentrytitle>
268
268
      <manvolnum>8mandos</manvolnum></citerefentry>,
269
 
      <citerefentry><refentrytitle>crypttab</refentrytitle>
270
 
      <manvolnum>5</manvolnum></citerefentry>,
271
269
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>
272
270
      <manvolnum>8mandos</manvolnum></citerefentry>,
273
271
      <citerefentry><refentrytitle>proc</refentrytitle>