From: Mark Eichin <eichin@mit.edu>
Date: Wed, 27 Jul 1994 20:30:29 +0000 (+0000)
Subject: HAVE_TTYENT_H, HAVE_SYS_LABEL_H
X-Git-Tag: krb5-1.0-beta4.2~93
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4c57b19b05e6da9da01e1220def0b0ac8839ddb;p=krb5.git

HAVE_TTYENT_H, HAVE_SYS_LABEL_H

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 191bb3765..5fa7ce8ee 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,6 +1,10 @@
 Wed Jul 27 12:52:04 1994  Mark Eichin  (eichin@tweedledumber.cygnus.com)
 
+	* login.c: HAVE_TTYENT_H.
+	* configure.in: add ttyent.h to HEADERS test.
+
 	* krshd.c: HAVE_SYS_LABEL_H, which seems to be SunOS 4 specific.
+	* krlogind.c: ditto.
 	* configure.in: test for add sys/label.h to HEADERS test.
 
 	* krcp.c (rsource): USE_DIRENT_H.
diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index ed5da0282..a68f0562f 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -9,7 +9,7 @@ AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
 AC_FUNC_CHECK(utimes,AC_DEFINE(HAS_UTIMES))
 AC_FUNC_CHECK(getutent,AC_DEFINE(HAVE_GETUTENT))
-AC_HAVE_HEADERS(sys/filio.h unistd.h sys/label.h)
+AC_HAVE_HEADERS(sys/filio.h unistd.h sys/label.h ttyent.h)
 CHECK_DIRENT
 CHECK_FCNTL
 AC_COMPILE_CHECK([F_SETOWN],
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index a8c5a4df3..969524185 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -122,7 +122,8 @@ static char sccsid[] = "@(#)rlogind.c	5.17 (Berkeley) 8/31/88";
 #include <errno.h>
 #include <pwd.h>
      
-#ifdef sun
+#ifdef HAVE_SYS_LABEL_H
+/* only SunOS 4? */
 #include <sys/label.h>
 #include <sys/audit.h>
 #include <pwdadj.h>
diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index a15209314..cc7a4bec6 100644
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -4,10 +4,6 @@
  *	$Id$
  */
 
-#ifndef lint
-static char rcsid_login_c[] = "$Id$";
-#endif lint
-
 /*
  * Copyright (c) 1980, 1987, 1988 The Regents of the University of California.
  * All rights reserved.
@@ -72,9 +68,9 @@ static char sccsid[] = "@(#)login.c	5.25 (Berkeley) 1/6/89";
 #endif
 
 #include <errno.h>
-#ifndef NOTTYENT
+#ifdef HAVE_TTYENT_H
 #include <ttyent.h>
-#endif /* NOTTYENT */
+#endif
 #include <syslog.h>
 #include <grp.h>
 #include <pwd.h>