X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fask-password-api.c;h=44ebc584914a6b5092835f0560e8ca09c7e7c299;hb=33c2ce7b200747c172d4899c717a8e9097d84659;hp=5997a03fb25529459543079003c2515ded088f22;hpb=de0671ee7fe465e108f62dcbbbe9366f81dd9e9a;p=elogind.git diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index 5997a03fb..44ebc5849 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -52,6 +52,7 @@ static void backspace_chars(int ttyfd, size_t p) { int ask_password_tty( const char *message, usec_t until, + bool echo, const char *flag_file, char **_passphrase) { @@ -218,7 +219,7 @@ int ask_password_tty( passphrase[p++] = c; if (!silent_mode && ttyfd >= 0) - loop_write(ttyfd, "*", 1, false); + loop_write(ttyfd, echo ? &c : "*", 1, false); dirty = true; } @@ -257,10 +258,8 @@ static int create_socket(char **name) { assert(name); fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); - if (fd < 0) { - log_error("socket() failed: %m"); - return -errno; - } + if (fd < 0) + return log_error_errno(errno, "socket() failed: %m"); snprintf(sa.un.sun_path, sizeof(sa.un.sun_path)-1, "/run/systemd/ask-password/sck.%" PRIx64, random_u64()); @@ -270,13 +269,13 @@ static int create_socket(char **name) { if (r < 0) { r = -errno; - log_error("bind() failed: %m"); + log_error_errno(errno, "bind(%s) failed: %m", sa.un.sun_path); goto fail; } if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0) { r = -errno; - log_error("SO_PASSCRED failed: %m"); + log_error_errno(errno, "SO_PASSCRED failed: %m"); goto fail; } @@ -300,6 +299,7 @@ int ask_password_agent( const char *icon, const char *id, usec_t until, + bool echo, bool accept_cached, char ***_passphrases) { @@ -328,7 +328,7 @@ int ask_password_agent( fd = mkostemp_safe(temp, O_WRONLY|O_CLOEXEC); if (fd < 0) { - log_error("Failed to create password file: %m"); + log_error_errno(errno, "Failed to create password file: %m"); r = -errno; goto finish; } @@ -337,7 +337,7 @@ int ask_password_agent( f = fdopen(fd, "w"); if (!f) { - log_error("Failed to allocate FILE: %m"); + log_error_errno(errno, "Failed to allocate FILE: %m"); r = -errno; goto finish; } @@ -346,7 +346,7 @@ int ask_password_agent( signal_fd = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC); if (signal_fd < 0) { - log_error("signalfd(): %m"); + log_error_errno(errno, "signalfd(): %m"); r = -errno; goto finish; } @@ -362,10 +362,12 @@ int ask_password_agent( "PID="PID_FMT"\n" "Socket=%s\n" "AcceptCached=%i\n" + "Echo=%i\n" "NotAfter="USEC_FMT"\n", getpid(), socket_name, accept_cached ? 1 : 0, + echo ? 1 : 0, until); if (message) @@ -380,7 +382,7 @@ int ask_password_agent( fflush(f); if (ferror(f)) { - log_error("Failed to write query file: %m"); + log_error_errno(errno, "Failed to write query file: %m"); r = -errno; goto finish; } @@ -392,7 +394,7 @@ int ask_password_agent( final[sizeof(final)-9] = 'k'; if (rename(temp, final) < 0) { - log_error("Failed to rename query file: %m"); + log_error_errno(errno, "Failed to rename query file: %m"); r = -errno; goto finish; } @@ -429,7 +431,7 @@ int ask_password_agent( if (errno == EINTR) continue; - log_error("poll() failed: %m"); + log_error_errno(errno, "poll() failed: %m"); r = -errno; goto finish; } @@ -468,11 +470,13 @@ int ask_password_agent( errno == EINTR) continue; - log_error("recvmsg() failed: %m"); + log_error_errno(errno, "recvmsg() failed: %m"); r = -errno; goto finish; } + cmsg_close_all(&msghdr); + if (n <= 0) { log_error("Message too short"); continue; @@ -550,7 +554,7 @@ int ask_password_auto(const char *message, const char *icon, const char *id, int r; char *s = NULL, **l = NULL; - r = ask_password_tty(message, until, NULL, &s); + r = ask_password_tty(message, until, false, NULL, &s); if (r < 0) return r; @@ -561,5 +565,5 @@ int ask_password_auto(const char *message, const char *icon, const char *id, *_passphrases = l; return r; } else - return ask_password_agent(message, icon, id, until, accept_cached, _passphrases); + return ask_password_agent(message, icon, id, until, false, accept_cached, _passphrases); }