[PATCH] agetty: return proper value if compiled without ISSUEDIR support

[PATCH] agetty: return proper value if compiled without ISSUEDIR support

[Patrick Steinhardt]

If agetty is compiled without support for ISSUEDIR, then it implements
a stub for `issuedir_read` that simply does nothing. In fact it does
too little, as it doesn't have a proper return statement even though the
function returns an integer.

Fix the issue by always returning `1` from `issuedir_read`. This
is the same error code that the real implementation of that function
returns in case it cannot open the directory and is thus a sensible
default to pretend that the directory doesn't exist.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 term-utils/agetty.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index a0d0876c3..3c20acc98 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -1783,6 +1783,7 @@ static int issuedir_read(struct issue *ie __attribute__((__unused__)),
 			struct options *op __attribute__((__unused__)),
 			struct termios *tp __attribute__((__unused__)))
 {
+	return 1;
 }
 #endif /* ISSUEDIR_SUPPORT */
 
-- 
2.24.1

Re: [PATCH] agetty: return proper value if compiled without ISSUEDIR support

[Karel Zak]

On Wed, Dec 11, 2019 at 02:44:22PM +0100, Patrick Steinhardt wrote:
>  term-utils/agetty.c | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks!

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com