mirror of
https://github.com/systemd/systemd.git
synced 2025-03-31 14:50:15 +03:00
Merge pull request #5069 from keszybz/fixlets
Small fixes and enhancements to docs and code
This commit is contained in:
Lennart Poettering
GitHub
commit
e843b04ee9
@ -925,7 +925,9 @@
|
||||
<citerefentry><refentrytitle>coredumpctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>
|
||||
<citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemd-journal-upload</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||
</para>
|
||||
</refsect1>
|
||||
</refentry>
|
||||
|
||||
@ -61,10 +61,9 @@
|
||||
a system password or passphrase from the user, using a question
|
||||
message specified on the command line. When run from a TTY it will
|
||||
query a password on the TTY and print it to standard output. When
|
||||
run with no TTY or with <option>--no-tty</option> it will query
|
||||
the password system-wide and allow active users to respond via
|
||||
several agents. The latter is only available to privileged
|
||||
processes.</para>
|
||||
run with no TTY or with <option>--no-tty</option> it will use the
|
||||
system-wide query mechanism, which allows active users to respond via
|
||||
several agents, listed below.</para>
|
||||
|
||||
<para>The purpose of this tool is to query system-wide passwords
|
||||
— that is passwords not attached to a specific user account.
|
||||
@ -76,25 +75,38 @@
|
||||
<itemizedlist>
|
||||
|
||||
<listitem><para>A boot-time password agent asking the user for
|
||||
passwords using Plymouth</para></listitem>
|
||||
passwords using
|
||||
<citerefentry project='die-net'><refentrytitle>plymouth</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
</para></listitem>
|
||||
|
||||
<listitem><para>A boot-time password agent querying the user
|
||||
directly on the console</para></listitem>
|
||||
directly on the console —
|
||||
<citerefentry><refentrytitle>systemd-ask-password-console.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
</para></listitem>
|
||||
|
||||
<listitem><para>An agent requesting password input via a
|
||||
<citerefentry
|
||||
project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
message</para></listitem>
|
||||
|
||||
<listitem><para>A command line agent which can be started
|
||||
temporarily to process queued password
|
||||
requests</para></listitem>
|
||||
<citerefentry project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
message —
|
||||
<citerefentry><refentrytitle>systemd-ask-password-wall.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
</para></listitem>
|
||||
|
||||
<listitem><para>A TTY agent that is temporarily spawned during
|
||||
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
invocations</para></listitem>
|
||||
invocations,</para></listitem>
|
||||
|
||||
<listitem><para>A command line agent which can be started
|
||||
temporarily to process queued password
|
||||
requests — <command>systemd-tty-ask-password-agent --query</command>.
|
||||
</para></listitem>
|
||||
</itemizedlist></para>
|
||||
|
||||
<para>Answering system-wide password queries is a privileged operation, hence
|
||||
all the agents listed above (except for the last one), run as privileged
|
||||
system services. The last one also needs elevated privileges, so
|
||||
should be run through
|
||||
<citerefentry project='die-net'><refentrytitle>sudo</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||
or similar.</para>
|
||||
|
||||
<para>Additional password agents may be implemented according to
|
||||
the <ulink
|
||||
url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">systemd
|
||||
@ -217,7 +229,8 @@
|
||||
<title>See Also</title>
|
||||
<para>
|
||||
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemd-ask-password-console.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemd-tty-ask-password</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry project='die-net'><refentrytitle>keyctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry project='die-net'><refentrytitle>plymouth</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
<citerefentry project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
|
||||
@ -50,7 +50,9 @@
|
||||
|
||||
<refsynopsisdiv>
|
||||
<cmdsynopsis>
|
||||
<command>systemd-tty-ask-password-agent <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt" rep="repeat">VARIABLE=VALUE</arg></command>
|
||||
<command>systemd-tty-ask-password-agent</command>
|
||||
<arg choice="opt" rep="repeat">OPTIONS</arg>
|
||||
<arg choice="opt" rep="repeat">VARIABLE=VALUE</arg>
|
||||
</cmdsynopsis>
|
||||
</refsynopsisdiv>
|
||||
|
||||
@ -65,8 +67,10 @@
|
||||
|
||||
<para><command>systemd-tty-ask-password-agent</command> implements
|
||||
the <ulink url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">Password
|
||||
Agents Specification</ulink>.</para>
|
||||
|
||||
Agents Specification</ulink>, and is one of many possible response agents which
|
||||
answer to queries formulated with
|
||||
<citerefentry><refentrytitle>systemd-ask-password</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
|
||||
</para>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
__systemctl() {
|
||||
local mode=$1; shift 1
|
||||
systemctl $mode --full --no-legend "$@"
|
||||
systemctl $mode --full --no-legend "$@" 2>/dev/null
|
||||
}
|
||||
|
||||
__systemd_properties() {
|
||||
|
||||
@ -91,7 +91,7 @@
|
||||
|
||||
__systemctl()
|
||||
{
|
||||
systemctl $_sys_service_mgr --full --no-legend --no-pager "$@"
|
||||
systemctl $_sys_service_mgr --full --no-legend --no-pager "$@" 2>/dev/null
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -102,7 +102,7 @@ const char* socket_address_get_path(const SocketAddress *a);
|
||||
|
||||
bool socket_ipv6_is_supported(void);
|
||||
|
||||
int sockaddr_port(const struct sockaddr *_sa, unsigned *port) _pure_;
|
||||
int sockaddr_port(const struct sockaddr *_sa, unsigned *port);
|
||||
|
||||
int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, bool include_port, char **ret);
|
||||
int getpeername_pretty(int fd, bool include_port, char **ret);
|
||||
|
||||
@ -449,7 +449,7 @@ static int socket_verify(Socket *s) {
|
||||
return 0;
|
||||
|
||||
if (!s->ports) {
|
||||
log_unit_error(UNIT(s), "Unit has no Listen setting (e.g. ListenStream=, ListenDatagram=, ListenFIFO, ...). Refusing.");
|
||||
log_unit_error(UNIT(s), "Unit has no Listen setting (ListenStream=, ListenDatagram=, ListenFIFO=, ...). Refusing.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
@ -60,14 +60,13 @@ Network.IPForward, config_parse_address_family_boolean_with
|
||||
Network.IPMasquerade, config_parse_bool, 0, offsetof(Network, ip_masquerade)
|
||||
Network.IPv6PrivacyExtensions, config_parse_ipv6_privacy_extensions, 0, offsetof(Network, ipv6_privacy_extensions)
|
||||
Network.IPv6AcceptRA, config_parse_tristate, 0, offsetof(Network, ipv6_accept_ra)
|
||||
Network.ActiveSlave, config_parse_bool, 0, offsetof(Network, active_slave)
|
||||
Network.PrimarySlave, config_parse_bool, 0, offsetof(Network, primary_slave)
|
||||
/* legacy alias for the above */
|
||||
Network.IPv6AcceptRouterAdvertisements, config_parse_tristate, 0, offsetof(Network, ipv6_accept_ra)
|
||||
Network.IPv6DuplicateAddressDetection, config_parse_int, 0, offsetof(Network, ipv6_dad_transmits)
|
||||
Network.IPv6HopLimit, config_parse_int, 0, offsetof(Network, ipv6_hop_limit)
|
||||
Network.ProxyARP, config_parse_tristate, 0, offsetof(Network, proxy_arp)
|
||||
Network.ActiveSlave, config_parse_bool, 0, offsetof(Network, active_slave)
|
||||
Network.PrimarySlave, config_parse_bool, 0, offsetof(Network, primary_slave)
|
||||
Network.IPv4ProxyARP, config_parse_tristate, 0, offsetof(Network, proxy_arp)
|
||||
Network.ProxyARP, config_parse_tristate, 0, offsetof(Network, proxy_arp)
|
||||
Network.BindCarrier, config_parse_strv, 0, offsetof(Network, bind_carrier)
|
||||
Address.Address, config_parse_address, 0, 0
|
||||
Address.Peer, config_parse_address, 0, 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user