X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fask-password-api.c;h=ce2f3cbe777fa0cc81420f9e662e35fea486de96;hb=e96d6be763014be75d480fde503d0b77f41194a0;hp=04d5623d9ee19597bf849de6a13c7c018d5b5dcf;hpb=7dcda352a609d063098e238db09c03cdc25c564b;p=elogind.git

diff --git a/src/ask-password-api.c b/src/ask-password-api.c
index 04d5623d9..ce2f3cbe7 100644
--- a/src/ask-password-api.c
+++ b/src/ask-password-api.c
@@ -89,10 +89,10 @@ int ask_password_tty(
                         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, "\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);
@@ -250,6 +250,7 @@ static int create_socket(char **name) {
         } sa;
         int one = 1, r;
         char *c;
+        mode_t u;
 
         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());
 
-        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;
@@ -310,6 +315,7 @@ int ask_password_agent(
         int socket_fd = -1, signal_fd = -1;
         sigset_t mask, oldmask;
         struct pollfd pollfd[_FD_MAX];
+        mode_t u;
 
         assert(_passphrases);
 
@@ -319,7 +325,11 @@ int ask_password_agent(
 
         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;