1
0
mirror of https://github.com/systemd/systemd synced 2026-03-16 18:14:46 +01:00

Compare commits

..

No commits in common. "db4b6b70434295aa7799ac74b80a6d708d1f0ba4" and "a9859a62f1af8bcd21bd7d7f3840d363e033bea2" have entirely different histories.

8 changed files with 12 additions and 35 deletions

View File

@ -31,7 +31,6 @@ Packages=
iproute iproute
iputils iputils
knot knot
libucontext
linux linux
man-db man-db
multipath-tools multipath-tools

View File

@ -43,7 +43,6 @@ Packages=
kernel-core kernel-core
knot knot
libcap-ng-utils libcap-ng-utils
libucontext
man-db man-db
nmap-ncat nmap-ncat
openssh-clients openssh-clients

View File

@ -10,4 +10,3 @@ Packages=
diffutils diffutils
erofs-utils erofs-utils
git git
libucontext

View File

@ -12,6 +12,5 @@ Packages=
git-core git-core
libasan libasan
libubsan libubsan
libucontext-devel
rpm-build rpm-build
which which

View File

@ -10,7 +10,6 @@ Packages=
clang-tools-extra clang-tools-extra
github-cli github-cli
lcov lcov
libucontext
mypy mypy
pkgconf pkgconf
ruff ruff

View File

@ -12,5 +12,4 @@ Packages=
rpm-build rpm-build
libasan libasan
libubsan libubsan
libucontext-devel
compiler-rt compiler-rt

View File

@ -432,7 +432,7 @@ static int handle_generic_user_record_error(
assert(secret); assert(secret);
(void) pam_prompt_graceful(pamh, PAM_TEXT_INFO, NULL, _("Please authenticate physically on security token of user %s."), user_name); (void) pam_prompt_graceful(pamh, PAM_ERROR_MSG, NULL, _("Please authenticate physically on security token of user %s."), user_name);
r = user_record_set_pkcs11_protected_authentication_path_permitted(secret, true); r = user_record_set_pkcs11_protected_authentication_path_permitted(secret, true);
if (r < 0) if (r < 0)
@ -443,7 +443,7 @@ static int handle_generic_user_record_error(
assert(secret); assert(secret);
(void) pam_prompt_graceful(pamh, PAM_TEXT_INFO, NULL, _("Please confirm presence on security token of user %s."), user_name); (void) pam_prompt_graceful(pamh, PAM_ERROR_MSG, NULL, _("Please confirm presence on security token of user %s."), user_name);
r = user_record_set_fido2_user_presence_permitted(secret, true); r = user_record_set_fido2_user_presence_permitted(secret, true);
if (r < 0) if (r < 0)
@ -454,7 +454,7 @@ static int handle_generic_user_record_error(
assert(secret); assert(secret);
(void) pam_prompt_graceful(pamh, PAM_TEXT_INFO, NULL, _("Please verify user on security token of user %s."), user_name); (void) pam_prompt_graceful(pamh, PAM_ERROR_MSG, NULL, _("Please verify user on security token of user %s."), user_name);
r = user_record_set_fido2_user_verification_permitted(secret, true); r = user_record_set_fido2_user_verification_permitted(secret, true);
if (r < 0) if (r < 0)

View File

@ -8,7 +8,6 @@
#include "alloc-util.h" #include "alloc-util.h"
#include "async.h" #include "async.h"
#include "dirent-util.h" #include "dirent-util.h"
#include "errno-util.h"
#include "fd-util.h" #include "fd-util.h"
#include "fdset.h" #include "fdset.h"
#include "log.h" #include "log.h"
@ -180,10 +179,9 @@ int fdset_new_fill(
d = opendir("/proc/self/fd"); d = opendir("/proc/self/fd");
if (!d) { if (!d) {
if (errno == ENOENT && proc_mounted() == 0) if (errno == ENOENT && proc_mounted() == 0)
return log_debug_errno(SYNTHETIC_ERRNO(ENOSYS), return -ENOSYS;
"Failed to open /proc/self/fd/, /proc/ is not mounted.");
return log_debug_errno(errno, "Failed to open /proc/self/fd/: %m "); return -errno;
} }
s = fdset_new(); s = fdset_new();
@ -212,14 +210,9 @@ int fdset_new_fill(
* been passed in can be collected and fds which have been created locally can be * been passed in can be collected and fds which have been created locally can be
* ignored, under the assumption that only the latter have O_CLOEXEC set. */ * ignored, under the assumption that only the latter have O_CLOEXEC set. */
fl = RET_NERRNO(fcntl(fd, F_GETFD)); fl = fcntl(fd, F_GETFD);
if (fl < 0) { if (fl < 0)
_cleanup_free_ char *path = NULL; return -errno;
(void) fd_get_path(fd, &path);
return log_debug_errno(fl,
"Failed to get flag of fd=%d (%s): %m ",
fd, strna(path));
}
if (FLAGS_SET(fl, FD_CLOEXEC) != !!filter_cloexec) if (FLAGS_SET(fl, FD_CLOEXEC) != !!filter_cloexec)
continue; continue;
@ -228,23 +221,13 @@ int fdset_new_fill(
/* We need to set CLOEXEC manually only if we're collecting non-CLOEXEC fds. */ /* We need to set CLOEXEC manually only if we're collecting non-CLOEXEC fds. */
if (filter_cloexec <= 0) { if (filter_cloexec <= 0) {
r = fd_cloexec(fd, true); r = fd_cloexec(fd, true);
if (r < 0) { if (r < 0)
_cleanup_free_ char *path = NULL; return r;
(void) fd_get_path(fd, &path);
return log_debug_errno(r,
"Failed to set CLOEXEC flag fd=%d (%s): %m ",
fd, strna(path));
}
} }
r = fdset_put(s, fd); r = fdset_put(s, fd);
if (r < 0) { if (r < 0)
_cleanup_free_ char *path = NULL; return r;
(void) fd_get_path(fd, &path);
return log_debug_errno(r,
"Failed to put fd=%d (%s) into fdset: %m ",
fd, strna(path));
}
} }
*ret = TAKE_PTR(s); *ret = TAKE_PTR(s);