chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pkg-config: export libexecdir, so that that gdm can use it to find the x server wrapper
[elogind.git]
/
src
/
ask-password-api.c
diff --git
a/src/ask-password-api.c
b/src/ask-password-api.c
index 384cfc8f8058cdd12a0bb7bf3f6cdd123ae4a5ef..ce2f3cbe777fa0cc81420f9e662e35fea486de96 100644
(file)
--- a/
src/ask-password-api.c
+++ b/
src/ask-password-api.c
@@
-89,10
+89,10
@@
int ask_password_tty(
goto finish;
}
goto finish;
}
- loop_write(ttyfd,
"\x1B[1m", 4
, false);
+ loop_write(ttyfd,
ANSI_HIGHLIGHT_ON, sizeof(ANSI_HIGHLIGHT_ON)-1
, false);
loop_write(ttyfd, message, strlen(message), false);
loop_write(ttyfd, " ", 1, false);
loop_write(ttyfd, message, strlen(message), false);
loop_write(ttyfd, " ", 1, false);
- loop_write(ttyfd,
"\x1B[0m", 4
, false);
+ loop_write(ttyfd,
ANSI_HIGHLIGHT_OFF, sizeof(ANSI_HIGHLIGHT_OFF)-1
, false);
new_termios = old_termios;
new_termios.c_lflag &= ~(ICANON|ECHO);
new_termios = old_termios;
new_termios.c_lflag &= ~(ICANON|ECHO);
@@
-250,6
+250,7
@@
static int create_socket(char **name) {
} sa;
int one = 1, r;
char *c;
} sa;
int one = 1, r;
char *c;
+ mode_t u;
assert(name);
assert(name);
@@
-262,7
+263,11
@@
static int create_socket(char **name) {
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());
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());
- if (bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0) {
+ u = umask(0177);
+ r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path));
+ umask(u);
+
+ if (r < 0) {
r = -errno;
log_error("bind() failed: %m");
goto fail;
r = -errno;
log_error("bind() failed: %m");
goto fail;
@@
-310,6
+315,7
@@
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);
@@
-319,7
+325,11
@@
int ask_password_agent(
mkdir_p("/run/systemd/ask-password", 0755);
mkdir_p("/run/systemd/ask-password", 0755);
- if ((fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY)) < 0) {
+ u = umask(0022);
+ fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY);
+ umask(u);
+
+ if (fd < 0) {
log_error("Failed to create password file: %m");
r = -errno;
goto finish;
log_error("Failed to create password file: %m");
r = -errno;
goto finish;
@@
-404,13
+414,13
@@
int ask_password_agent(
t = now(CLOCK_MONOTONIC);
t = now(CLOCK_MONOTONIC);
- if (until <= t) {
+ if (until
> 0 && until
<= t) {
log_notice("Timed out");
r = -ETIME;
goto finish;
}
log_notice("Timed out");
r = -ETIME;
goto finish;
}
- if ((k = poll(pollfd, _FD_MAX,
(until-t)/USEC_PER_MSEC
)) < 0) {
+ if ((k = poll(pollfd, _FD_MAX,
until > 0 ? (int) ((until-t)/USEC_PER_MSEC) : -1
)) < 0) {
if (errno == EINTR)
continue;
if (errno == EINTR)
continue;