This reverts commit 437a85112e.
The outcome of this isn't that clear, let's revert this for now, see
discussion on #6286.
This commit is contained in:
committed by
Zbigniew Jędrzejewski-Szmek
parent
6297d07b82
commit
782c925f7f
@@ -1102,10 +1102,6 @@ typedef int32_t key_serial_t;
|
||||
#define KEYCTL_DESCRIBE 6
|
||||
#endif
|
||||
|
||||
#ifndef KEYCTL_LINK
|
||||
#define KEYCTL_LINK 8
|
||||
#endif
|
||||
|
||||
#ifndef KEYCTL_READ
|
||||
#define KEYCTL_READ 11
|
||||
#endif
|
||||
|
||||
@@ -2099,14 +2099,6 @@ static int setup_keyring(Unit *u, const ExecParameters *p, uid_t uid, gid_t gid)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Having our own session keyring is nice, but results in keys added
|
||||
* to the user keyring being inaccessible with permission denied.
|
||||
* So link the user keyring to our session keyring. */
|
||||
if (keyctl(KEYCTL_LINK,
|
||||
KEY_SPEC_USER_KEYRING,
|
||||
keyring, 0, 0) < 0)
|
||||
return log_debug_errno(errno, "Failed to link user keyring to session keyring.");
|
||||
|
||||
/* Populate they keyring with the invocation ID by default. */
|
||||
if (!sd_id128_is_null(u->invocation_id)) {
|
||||
key_serial_t key;
|
||||
|
||||
Reference in New Issue
Block a user