>From 11167af9538fb8526d30784ae048d45d1abc83b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <address@hidden>
Date: Thu, 22 May 2014 17:09:49 +0100
Subject: [PATCH] getlogin_r-tests: fix various issues in recent change

* tests/test-getlogin_r.c: Include required headers that were
missed in recent commit eec20b4e.
Also consistently check the errno rather than the return value from
getlogin_r as POSIX only specifies that non zero is returned on error.
* modules/getlogin_r-tests (configure.ac): Add the check for ttyname().
---
 ChangeLog                |    9 +++++++++
 modules/getlogin_r-tests |    1 +
 tests/test-getlogin_r.c  |    7 ++++++-
 3 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35ddc05..aa34350 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-05-22  Pádraig Brady  <address@hidden>
+
+	getlogin_r-tests: fix various issues in recent change
+	* tests/test-getlogin_r.c: Include required headers that were
+	missed in recent commit eec20b4e.
+	Also consistently check the errno rather than the return value from
+	getlogin_r as POSIX only specifies that non zero is returned on error.
+	* modules/getlogin_r-tests (configure.ac): Add the check for ttyname().
+
 2014-05-21  Paul Eggert  <address@hidden>
 
 	fchdir: port 'open' and 'close' redefinitions to AIX 7.1
diff --git a/modules/getlogin_r-tests b/modules/getlogin_r-tests
index 22dfba5..eda7b45 100644
--- a/modules/getlogin_r-tests
+++ b/modules/getlogin_r-tests
@@ -6,6 +6,7 @@ tests/macros.h
 Depends-on:
 
 configure.ac:
+AC_CHECK_FUNCS_ONCE([ttyname])
 
 Makefile.am:
 TESTS += test-getlogin_r
diff --git a/tests/test-getlogin_r.c b/tests/test-getlogin_r.c
index fb3f9bf..5c7078d 100644
--- a/tests/test-getlogin_r.c
+++ b/tests/test-getlogin_r.c
@@ -27,6 +27,11 @@ SIGNATURE_CHECK (getlogin_r, int, (char *, size_t));
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <pwd.h>
+
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "macros.h"
 
@@ -48,7 +53,7 @@ main (void)
         }
 
       /* getlogin_r() fails when stdin is not connected to a tty.  */
-      ASSERT (err == ENOTTY
+      ASSERT (errno == ENOTTY
               || errno == EINVAL /* seen on Linux/SPARC */
               || errno == ENXIO
              );
-- 
1.7.7.6