* Tell configure.in that AIX doesn't have streams; it has the header

files but not a streams TTY interface that is widely used.  More
important, strops.h breaks _IO.

* Use ptsname() before ttyname() if present; it is more likely to give
what we want.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6295 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index fec8229b8739cdd445a30c9107b0a8e0c2d11e90..606de5fa6f4119d5d57823f56d4d55296bf68cc5 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,14 @@
+Thu Jul 13 17:49:54 1995  Sam Hartman  <hartmans@tertius.mit.edu>
+
+       * configure.in : Short circuit the streams test for AIX to false
+        because AIX strops.h trashes definition of _IO from sys/ioctl.h.
+        I think this is fixed in AIX4, so the test is only bypassed for
+        AIX3.
+
+Tue Jul 11 12:50:16 1995  Sam Hartman  <hartmans@tertius.mit.edu>
+
+       * krlogind.c (getpty): Use ptsname before ttyname; it has a higher
+        chance of doing what we want.
 
 Fri Jul 7 15:40:42 EDT 1995    Paul Park       (pjpark@mit.edu)
        * Makefile.in - Remove all explcitit library handling.

diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index b68eeb59f39b0d262d3644b855bf02c449a7daaa..80429e2a4d2b611814636635e33b6894c62655fd 100644 (file)
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -17,6 +17,10 @@ dnl Make our operating system-specific security checks and definitions for
 dnl login.
 dnl
 case $krb5_cv_host in
+*-*-aix3*) # AIX has streams include files but not streams TTY
+# Moreover, strops.h trashes sys/ioctl.h
+krb5_cv_has_streams=no
+;;
 alpha-dec-osf*)
        AC_CHECK_LIB(security,main,
                AC_DEFINE(HAVE_SETLUID)

diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index 04fd6190c4b784345c22b0ec88104e8dab044f19..8724841fecaf3c7c39662d375399893bcc9087c5 100644 (file)
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -1425,11 +1425,11 @@ getpty(fd,slave)
        if (grantpt(*fd) || unlockpt(*fd)) return 1;
 #endif
     
-#ifdef HAVE_TTYNAME
-       p = ttyname(*fd);
-#else
 #ifdef HAVE_PTSNAME
        p = ptsname(*fd);
+#else
+#ifdef HAVE_TTYNAME
+       p = ttyname(*fd);
 #else
        /* XXX If we don't have either what do we do */
 #endif