X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fask-password-api.c;h=755abf0b5e4c37279babfefe5aa4b6e1f2613946;hb=2cfbd749af308bdbe56edcfed7f3eea0fc2b93d2;hp=277efd302ef60e3478f5a25c54e8fd9d98189ddc;hpb=5c0d398dfc4d79df2209515d28cafd9dc129838e;p=elogind.git diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index 277efd302..755abf0b5 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -109,7 +109,6 @@ int ask_password_tty( } zero(pollfd); - pollfd[POLL_TTY].fd = ttyfd >= 0 ? ttyfd : STDIN_FILENO; pollfd[POLL_TTY].events = POLLIN; pollfd[POLL_INOTIFY].fd = notify; @@ -248,8 +247,11 @@ static int create_socket(char **name) { union { struct sockaddr sa; struct sockaddr_un un; - } sa; - int one = 1, r; + } sa = { + .un.sun_family = AF_UNIX, + }; + int one = 1; + int r = 0; char *c; assert(name); @@ -260,8 +262,6 @@ static int create_socket(char **name) { return -errno; } - zero(sa); - 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()); RUN_WITH_UMASK(0177) {