tty-ask-pw-agent: properly propagate error

poettering · poettering · commit a4fd6cd3f575 · 2020-08-26T23:10:50.000+02:00
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -143,8 +143,7 @@ static int agent_ask_password_tty(
                 const char *flag_file,
                 char ***ret) {
 
-        int tty_fd = -1;
-        int r;
+        int tty_fd = -1, r;
 
         if (arg_console) {
                 const char *con = arg_device ?: "/dev/console";
@@ -166,7 +165,7 @@ static int agent_ask_password_tty(
                 release_terminal();
         }
 
-        return 0;
+        return r;
 }
 
 static int process_one_password_file(const char *filename) {

Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,7 @@ static int agent_ask_password_tty(`
`143`	`143`	`const char *flag_file,`
`144`	`144`	`char ***ret) {`
`145`	`145`
`146`		`- int tty_fd = -1;`
`147`		`- int r;`
	`146`	`+ int tty_fd = -1, r;`
`148`	`147`
`149`	`148`	`if (arg_console) {`
`150`	`149`	`const char *con = arg_device ?: "/dev/console";`
`@@ -166,7 +165,7 @@ static int agent_ask_password_tty(`
`166`	`165`	`release_terminal();`
`167`	`166`	`}`
`168`	`167`
`169`		`- return 0;`
	`168`	`+ return r;`
`170`	`169`	`}`
`171`	`170`
`172`	`171`	`static int process_one_password_file(const char *filename) {`