chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cryptsetup-generator: Add support for UUID-specific key files on kernel command line
[elogind.git]
/
src
/
random-seed
/
random-seed.c
diff --git
a/src/random-seed/random-seed.c
b/src/random-seed/random-seed.c
index 7714bcef9fe716383a6913ce96116b715b032385..40eaaf46d90fed860e3faf1ec9fbb3167cf8adeb 100644
(file)
--- a/
src/random-seed/random-seed.c
+++ b/
src/random-seed/random-seed.c
@@
-86,7
+86,7
@@
int main(int argc, char *argv[]) {
if (seed_fd < 0) {
seed_fd = open(RANDOM_SEED, O_RDONLY|O_CLOEXEC|O_NOCTTY);
if (seed_fd < 0) {
if (seed_fd < 0) {
seed_fd = open(RANDOM_SEED, O_RDONLY|O_CLOEXEC|O_NOCTTY);
if (seed_fd < 0) {
- log_error
(
"Failed to open " RANDOM_SEED ": %m");
+ log_error
_errno(errno,
"Failed to open " RANDOM_SEED ": %m");
r = -errno;
goto finish;
}
r = -errno;
goto finish;
}
@@
-96,7
+96,7
@@
int main(int argc, char *argv[]) {
if (random_fd < 0) {
random_fd = open("/dev/urandom", O_WRONLY|O_CLOEXEC|O_NOCTTY, 0600);
if (random_fd < 0) {
if (random_fd < 0) {
random_fd = open("/dev/urandom", O_WRONLY|O_CLOEXEC|O_NOCTTY, 0600);
if (random_fd < 0) {
- log_error
(
"Failed to open /dev/urandom: %m");
+ log_error
_errno(errno,
"Failed to open /dev/urandom: %m");
r = -errno;
goto finish;
}
r = -errno;
goto finish;
}
@@
-106,7
+106,7
@@
int main(int argc, char *argv[]) {
if (k <= 0) {
if (r != 0)
if (k <= 0) {
if (r != 0)
- log_error
(
"Failed to read seed from " RANDOM_SEED ": %m");
+ log_error
_errno(errno,
"Failed to read seed from " RANDOM_SEED ": %m");
r = k == 0 ? -EIO : (int) k;
r = k == 0 ? -EIO : (int) k;
@@
-125,14
+125,14
@@
int main(int argc, char *argv[]) {
seed_fd = open(RANDOM_SEED, O_WRONLY|O_CLOEXEC|O_NOCTTY|O_CREAT, 0600);
if (seed_fd < 0) {
seed_fd = open(RANDOM_SEED, O_WRONLY|O_CLOEXEC|O_NOCTTY|O_CREAT, 0600);
if (seed_fd < 0) {
- log_error
(
"Failed to open " RANDOM_SEED ": %m");
+ log_error
_errno(errno,
"Failed to open " RANDOM_SEED ": %m");
r = -errno;
goto finish;
}
random_fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
if (random_fd < 0) {
r = -errno;
goto finish;
}
random_fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
if (random_fd < 0) {
- log_error
(
"Failed to open /dev/urandom: %m");
+ log_error
_errno(errno,
"Failed to open /dev/urandom: %m");
r = -errno;
goto finish;
}
r = -errno;
goto finish;
}