- Configure tweaking for new login code on Irix 5.3

This commit is contained in:
Damien Miller 2000-06-04 15:51:47 +10:00
parent 60f3c983cc
commit 2994e0891b
3 changed files with 33 additions and 11 deletions

View File

@ -1,3 +1,6 @@
20000604
- Configure tweaking for new login code on Irix 5.3
20000531 20000531
- Cleanup of auth.c, login.c and fake-* - Cleanup of auth.c, login.c and fake-*
- Cleanup of auth-pam.c, save and print "account expired" error messages - Cleanup of auth-pam.c, save and print "account expired" error messages

View File

@ -936,19 +936,38 @@ AC_TRY_COMPILE([
#ifdef HAVE_LASTLOG_H #ifdef HAVE_LASTLOG_H
# include <lastlog.h> # include <lastlog.h>
#endif #endif
#ifdef PATHS_H #ifdef HAVE_PATHS_H
# include <paths.h> # include <paths.h>
#endif #endif
], ],
[ char *lastlog = LASTLOG_FILE; ], [ char *lastlog = LASTLOG_FILE; ],
[ AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no) [
system_lastlog_path=no ] AC_MSG_RESULT(no)
AC_MSG_CHECKING([if your system defines _PATH_LASTLOG])
AC_TRY_COMPILE([
#include <sys/types.h>
#include <utmp.h>
#ifdef HAVE_LASTLOG_H
# include <lastlog.h>
#endif
#ifdef HAVE_PATHS_H
# include <paths.h>
#endif
],
[ char *lastlog = _PATH_LASTLOG; ],
[ AC_MSG_RESULT(yes) ],
[
AC_MSG_RESULT(no),
system_lastlog_path=no
])
]
) )
if test -z "$conf_lastlog_location"; then if test -z "$conf_lastlog_location"; then
if test x"$system_lastlog_path" = x"no" ; then if test x"$system_lastlog_path" = x"no" ; then
for f in /var/log/lastlog /usr/adm/lastlog /var/adm/lastlog /etc/security/lastlog ; do for f in /var/log/lastlog /usr/adm/lastlog /var/adm/lastlog /etc/security/lastlog ; do
if test -e $f ; then if test -d "$f" -o -e "$f" ; then
conf_lastlog_location=$f conf_lastlog_location=$f
fi fi
done done
@ -968,7 +987,7 @@ AC_MSG_CHECKING([if your system defines UTMP_FILE])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <sys/types.h> #include <sys/types.h>
#include <utmp.h> #include <utmp.h>
#ifdef PATHS_H #ifdef HAVE_PATHS_H
# include <paths.h> # include <paths.h>
#endif #endif
], ],
@ -998,7 +1017,7 @@ AC_MSG_CHECKING([if your system defines WTMP_FILE])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <sys/types.h> #include <sys/types.h>
#include <utmp.h> #include <utmp.h>
#ifdef PATHS_H #ifdef HAVE_PATHS_H
# include <paths.h> # include <paths.h>
#endif #endif
], ],
@ -1034,7 +1053,7 @@ AC_TRY_COMPILE([
#ifdef HAVE_UTMPX_H #ifdef HAVE_UTMPX_H
#include <utmpx.h> #include <utmpx.h>
#endif #endif
#ifdef PATHS_H #ifdef HAVE_PATHS_H
# include <paths.h> # include <paths.h>
#endif #endif
], ],
@ -1059,7 +1078,7 @@ AC_TRY_COMPILE([
#ifdef HAVE_UTMPX_H #ifdef HAVE_UTMPX_H
#include <utmpx.h> #include <utmpx.h>
#endif #endif
#ifdef PATHS_H #ifdef HAVE_PATHS_H
# include <paths.h> # include <paths.h>
#endif #endif
], ],

View File

@ -281,12 +281,12 @@ typedef int ssize_t;
# define WTMP_FILE _PATH_WTMP # define WTMP_FILE _PATH_WTMP
#endif #endif
/* pick up the user's location for lastlog if given */ /* pick up the user's location for lastlog if given */
#ifdef CONF_LASTLOG_FILE
# define LASTLOG_FILE CONF_LASTLOG_FILE
#endif
#if !defined(LASTLOG_FILE) && defined(_PATH_LASTLOG) #if !defined(LASTLOG_FILE) && defined(_PATH_LASTLOG)
# define LASTLOG_FILE _PATH_LASTLOG # define LASTLOG_FILE _PATH_LASTLOG
#endif #endif
#if !defined(LASTLOG_FILE) && defined(CONF_LASTLOG_FILE)
# define LASTLOG_FILE CONF_LASTLOG_FILE
#endif
/* The login() library function in libutil is first choice */ /* The login() library function in libutil is first choice */