chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: add the --plain option to the help message
[elogind.git]
/
src
/
shared
/
ask-password-api.c
diff --git
a/src/shared/ask-password-api.c
b/src/shared/ask-password-api.c
index 55be807cf20eb634b44b6939288d2febaef7e6d7..755abf0b5e4c37279babfefe5aa4b6e1f2613946 100644
(file)
--- a/
src/shared/ask-password-api.c
+++ b/
src/shared/ask-password-api.c
@@
-109,7
+109,6
@@
int ask_password_tty(
}
zero(pollfd);
}
zero(pollfd);
-
pollfd[POLL_TTY].fd = ttyfd >= 0 ? ttyfd : STDIN_FILENO;
pollfd[POLL_TTY].events = POLLIN;
pollfd[POLL_INOTIFY].fd = notify;
pollfd[POLL_TTY].fd = ttyfd >= 0 ? ttyfd : STDIN_FILENO;
pollfd[POLL_TTY].events = POLLIN;
pollfd[POLL_INOTIFY].fd = notify;
@@
-248,25
+247,26
@@
static int create_socket(char **name) {
union {
struct sockaddr sa;
struct sockaddr_un un;
union {
struct sockaddr sa;
struct sockaddr_un un;
- } sa;
- int one = 1, r;
+ } sa = {
+ .un.sun_family = AF_UNIX,
+ };
+ int one = 1;
+ int r = 0;
char *c;
char *c;
- mode_t u;
assert(name);
assert(name);
- if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0)) < 0) {
+ fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+ if (fd < 0) {
log_error("socket() failed: %m");
return -errno;
}
log_error("socket() failed: %m");
return -errno;
}
- zero(sa);
- sa.un.sun_family = AF_UNIX;
snprintf(sa.un.sun_path, sizeof(sa.un.sun_path)-1, "/run/systemd/ask-password/sck.%llu", random_ull());
snprintf(sa.un.sun_path, sizeof(sa.un.sun_path)-1, "/run/systemd/ask-password/sck.%llu", random_ull());
- u = umask(0177);
- r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path));
- umask(u);
+ RUN_WITH_UMASK(0177) {
+
r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path));
+ }
if (r < 0) {
r = -errno;
if (r < 0) {
r = -errno;
@@
-280,9
+280,9
@@
static int create_socket(char **name) {
goto fail;
}
goto fail;
}
- if (!(c = strdup(sa.un.sun_path))) {
- r = -ENOMEM;
-
log_error("Out of memory"
);
+ c = strdup(sa.un.sun_path);
+ if (!c) {
+
r = log_oom(
);
goto fail;
}
goto fail;
}
@@
-316,7
+316,6
@@
int ask_password_agent(
int socket_fd = -1, signal_fd = -1;
sigset_t mask, oldmask;
struct pollfd pollfd[_FD_MAX];
int socket_fd = -1, signal_fd = -1;
sigset_t mask, oldmask;
struct pollfd pollfd[_FD_MAX];
- mode_t u;
assert(_passphrases);
assert(_passphrases);
@@
-324,11
+323,11
@@
int ask_password_agent(
sigset_add_many(&mask, SIGINT, SIGTERM, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, &oldmask) == 0);
sigset_add_many(&mask, SIGINT, SIGTERM, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, &oldmask) == 0);
- mkdir_p("/run/systemd/ask-password", 0755);
+ mkdir_p
_label
("/run/systemd/ask-password", 0755);
- u = umask(0022);
- fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY);
- umask(u);
+ RUN_WITH_UMASK(0022) {
+
fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY);
+ }
if (fd < 0) {
log_error("Failed to create password file: %m");
if (fd < 0) {
log_error("Failed to create password file: %m");