chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: add console-shell.service which can be used insted of the gettys to get a...
[elogind.git]
/
src
/
tty-ask-password-agent.c
diff --git
a/src/tty-ask-password-agent.c
b/src/tty-ask-password-agent.c
index 922dac3dc600f993af96dff721fcd859b140a560..2c854fa8d986fc293f98cabecaac524755f3d80e 100644
(file)
--- a/
src/tty-ask-password-agent.c
+++ b/
src/tty-ask-password-agent.c
@@
-315,7
+315,7
@@
static int parse_password(const char *filename, char **wall) {
struct sockaddr sa;
struct sockaddr_un un;
} sa;
struct sockaddr sa;
struct sockaddr_un un;
} sa;
- size_t packet_length;
+ size_t packet_length
= 0
;
assert(arg_action == ACTION_QUERY ||
arg_action == ACTION_WATCH);
assert(arg_action == ACTION_QUERY ||
arg_action == ACTION_WATCH);
@@
-330,7
+330,7
@@
static int parse_password(const char *filename, char **wall) {
}
if (arg_plymouth) {
}
if (arg_plymouth) {
- char **passwords;
+ char **passwords
= NULL
;
if ((r = ask_password_plymouth(message, not_after, filename, accept_cached, &passwords)) >= 0) {
char **p;
if ((r = ask_password_plymouth(message, not_after, filename, accept_cached, &passwords)) >= 0) {
char **p;
@@
-431,7
+431,7
@@
static int wall_tty_block(void) {
if ((r = get_ctty_devnr(&devnr)) < 0)
return -r;
if ((r = get_ctty_devnr(&devnr)) < 0)
return -r;
- if (asprintf(&p, "/dev/.systemd/ask-password-block/%u:%u", major(devnr), minor(devnr)) < 0)
+ if (asprintf(&p, "/dev/.
run/
systemd/ask-password-block/%u:%u", major(devnr), minor(devnr)) < 0)
return -ENOMEM;
mkdir_parents(p, 0700);
return -ENOMEM;
mkdir_parents(p, 0700);
@@
-475,7
+475,7
@@
static bool wall_tty_match(const char *path) {
* advantage that the block will automatically go away if the
* process dies. */
* advantage that the block will automatically go away if the
* process dies. */
- if (asprintf(&p, "/dev/.systemd/ask-password-block/%u:%u", major(st.st_rdev), minor(st.st_rdev)) < 0)
+ if (asprintf(&p, "/dev/.
run/
systemd/ask-password-block/%u:%u", major(st.st_rdev), minor(st.st_rdev)) < 0)
return true;
fd = open(p, O_WRONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
return true;
fd = open(p, O_WRONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
@@
-494,7
+494,7
@@
static int show_passwords(void) {
struct dirent *de;
int r = 0;
struct dirent *de;
int r = 0;
- if (!(d = opendir("/dev/.systemd/ask-password"))) {
+ if (!(d = opendir("/dev/.
run/
systemd/ask-password"))) {
if (errno == ENOENT)
return 0;
if (errno == ENOENT)
return 0;
@@
-507,6
+507,9
@@
static int show_passwords(void) {
int q;
char *wall;
int q;
char *wall;
+ /* We only support /dev on tmpfs, hence we can rely on
+ * d_type to be reliable */
+
if (de->d_type != DT_REG)
continue;
if (de->d_type != DT_REG)
continue;
@@
-516,7
+519,7
@@
static int show_passwords(void) {
if (!startswith(de->d_name, "ask."))
continue;
if (!startswith(de->d_name, "ask."))
continue;
- if (!(p = strappend("/dev/.systemd/ask-password/", de->d_name))) {
+ if (!(p = strappend("/dev/.
run/
systemd/ask-password/", de->d_name))) {
log_error("Out of memory");
r = -ENOMEM;
goto finish;
log_error("Out of memory");
r = -ENOMEM;
goto finish;
@@
-555,14
+558,14
@@
static int watch_passwords(void) {
tty_block_fd = wall_tty_block();
tty_block_fd = wall_tty_block();
- mkdir_p("/dev/.systemd/ask-password", 0755);
+ mkdir_p("/dev/.
run/
systemd/ask-password", 0755);
if ((notify = inotify_init1(IN_CLOEXEC)) < 0) {
r = -errno;
goto finish;
}
if ((notify = inotify_init1(IN_CLOEXEC)) < 0) {
r = -errno;
goto finish;
}
- if (inotify_add_watch(notify, "/dev/.systemd/ask-password", IN_CLOSE_WRITE|IN_MOVED_TO) < 0) {
+ if (inotify_add_watch(notify, "/dev/.
run/
systemd/ask-password", IN_CLOSE_WRITE|IN_MOVED_TO) < 0) {
r = -errno;
goto finish;
}
r = -errno;
goto finish;
}