update_wtmp.c: Don't use updwtmpx() even if it exists for glibc 2.1,

	since it's the same as updwtmp(), and glibc doesn't define PATH_WTMPX.
	updwtmpx() is not part of the XPG standard anyway.  (Needed for RedHat
	6.0.)

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

diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index a910a15d177063ade0792c01079a9cd45d522852..b6a34041da12c431e530c303fabc28be3a35e6a1 100644 (file)
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,10 @@
+1999-04-14    <tytso@rsts-11.mit.edu>
+
+       * update_wtmp.c: Don't use updwtmpx() even if it exists for glibc
+               2.1, since it's the same as updwtmp(), and glibc doesn't
+               define PATH_WTMPX.  updwtmpx() is not part of the XPG
+               standard anyway.  (Needed for RedHat 6.0.)
+
 Sun Mar 28 17:50:57 1999  Tom Yu  <tlyu@mit.edu>
 
        * update_wtmp.c: Define WTMPX_FILE to be _PATH_WTMPX in case we're

diff --git a/src/util/pty/update_wtmp.c b/src/util/pty/update_wtmp.c
index b65b87092a5cf83dd1fddf0e3bae88a1b216606b..9d3af21285cf20142bbcbaa639bee6d2aeac5a60 100644 (file)
--- a/src/util/pty/update_wtmp.c
+++ b/src/util/pty/update_wtmp.c
@@ -34,6 +34,13 @@
 #define        WTMP_FILE       "/usr/adm/wtmp"
 #endif
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
+/* This is ugly, but the lack of standardization in the utmp/utmpx
+ * space, and what glibc implements and doesn't make available, is
+ * even worse.
+ */
+#undef HAVE_UPDWTMPX           /* Don't use updwtmpx for glibc 2.1 */
+#endif
 
 long ptyint_update_wtmp (ent , host, user)
     struct utmp *ent;