SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty-ask-password-agent: don't open terminal multiple times

Browse Source 
We already have the terminal open, hence pass the fd we got to
ask_password_tty(), so that it doesn't have to reopen it a second time.

This is mostly an optimization, but it has the nice benefit of making us
independent from RLIMIT_NOFILE issues and so on, as we don't need to
allocate another fd needlessly.
This commit is contained in:
Lennart Poettering
2018-02-14 00:11:16 +01:00
parent 088dcd8e41
commit daa557208d
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/ask-password-api.c
+7 -4
View File
@@ -202,6 +202,7 @@ static void backspace_chars(int ttyfd, size_t p) {
}
int ask_password_tty(
int ttyfd,
const char *message,
const char *keyname,
usec_t until,
@@ -215,7 +216,7 @@ int ask_password_tty(
_POLL_MAX,
};
_cleanup_close_ int ttyfd = -1, notify = -1;
_cleanup_close_ int cttyfd = -1, notify = -1;
struct termios old_termios, new_termios;
char passphrase[LINE_MAX + 1] = {}, *x;
struct pollfd pollfd[_POLL_MAX];
@@ -241,9 +242,11 @@ int ask_password_tty(
return -errno;
}
ttyfd = open("/dev/tty", O_RDWR|O_NOCTTY|O_CLOEXEC);
if (ttyfd >= 0) {
/* If the caller didn't specify a TTY, then use the controlling tty, if we can. */
if (ttyfd < 0)
ttyfd = cttyfd = open("/dev/tty", O_RDWR|O_NOCTTY|O_CLOEXEC);
if (ttyfd >= 0) {
if (tcgetattr(ttyfd, &old_termios) < 0)
return -errno;
@@ -715,7 +718,7 @@ int ask_password_auto(
if (!(flags & ASK_PASSWORD_NO_TTY) && isatty(STDIN_FILENO)) {
char *s = NULL, **l = NULL;
r = ask_password_tty(message, keyname, until, flags, NULL, &s);
r = ask_password_tty(-1, message, keyname, until, flags, NULL, &s);
if (r < 0)
return r;
src/shared/ask-password-api.h
+1 -1
View File
@@ -33,7 +33,7 @@ typedef enum AskPasswordFlags {
ASK_PASSWORD_NO_AGENT = 32,
} AskPasswordFlags;
int ask_password_tty(const char *message, const char *keyname, usec_t until, AskPasswordFlags flags, const char *flag_file, char **ret);
int ask_password_tty(int tty_fd, const char *message, const char *keyname, usec_t until, AskPasswordFlags flags, const char *flag_file, char **ret);
int ask_password_agent(const char *message, const char *icon, const char *id, const char *keyname, usec_t until, AskPasswordFlags flag, char ***ret);
int ask_password_keyring(const char *keyname, AskPasswordFlags flags, char ***ret);
int ask_password_auto(const char *message, const char *icon, const char *id, const char *keyname, usec_t until, AskPasswordFlags flag, char ***ret);