Merge tag 'systemd/v238.0-3.parabola1' into systemd/parabola

1 files changed, 8 insertions, 7 deletions

diff --git a/src/shared/ask-password-api.h b/src/shared/ask-password-api.h
index f3ca6743a9..4b2eb3fe92 100644
--- a/src/shared/ask-password-api.h
+++ b/src/shared/ask-password-api.h
@@ -25,15 +25,16 @@
 #include "time-util.h"
 
 typedef enum AskPasswordFlags {
-        ASK_PASSWORD_ACCEPT_CACHED = 1,
-        ASK_PASSWORD_PUSH_CACHE = 2,
-        ASK_PASSWORD_ECHO = 4,                /* show the password literally while reading, instead of "*" */
-        ASK_PASSWORD_SILENT = 8,              /* do no show any password at all while reading */
-        ASK_PASSWORD_NO_TTY = 16,
-        ASK_PASSWORD_NO_AGENT = 32,
+        ASK_PASSWORD_ACCEPT_CACHED = 1U << 0,
+        ASK_PASSWORD_PUSH_CACHE    = 1U << 1,
+        ASK_PASSWORD_ECHO          = 1U << 2, /* show the password literally while reading, instead of "*" */
+        ASK_PASSWORD_SILENT        = 1U << 3, /* do no show any password at all while reading */
+        ASK_PASSWORD_NO_TTY        = 1U << 4,
+        ASK_PASSWORD_NO_AGENT      = 1U << 5,
+        ASK_PASSWORD_CONSOLE_COLOR = 1U << 6, /* Use color if /dev/console points to a console that supports color */
 } 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);