From 00c99ae5a1709407bc167c47dfb717c656b6280c Mon Sep 17 00:00:00 2001

From: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>

Date: Thu, 3 Apr 2014 21:17:20 +0200

Subject: [PATCH] tty-ask-password-agent: return negative errno

Return negative errno in wall_tty_block(). get_ctty_devnr() already

returns a negative errno in case of failure, no need to negate it again.

Reported-by: Simon <hwold@odai.homelinux.net>

(cherry picked from commit ee0e4cca5ac37a094dfe1074907dae70c7b7701c)

(cherry picked from commit f418ad2852755baf95dadbf472f10d1c64da0993)

---

 src/tty-ask-password-agent/tty-ask-password-agent.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c

index f463662..256c21d 100644

--- a/src/tty-ask-password-agent/tty-ask-password-agent.c

+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c

@@ -438,7 +438,7 @@ static int wall_tty_block(void) {

         r = get_ctty_devnr(0, &devnr);

         if (r < 0)

-                return -r;

+                return r;

         if (asprintf(&p, "/run/systemd/ask-password-block/%u:%u", major(devnr), minor(devnr)) < 0)

                 return -ENOMEM;