ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 02:46:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try and fix utmp handling

Browse Source
This commit is contained in:
Matt Johnston 2013-11-25 23:30:01 +08:00
parent c5e36f8e3c
commit e5c52796c3
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -540,7 +540,9 @@ dnl wtmp detection
AC_MSG_CHECKING([if your system defines WTMP_FILE]) AC_MSG_CHECKING([if your system defines WTMP_FILE])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h> #include <sys/types.h>
#include <utmp.h> #ifdef HAVE_UTMP_H
# include <utmp.h>
#endif
#ifdef HAVE_PATHS_H #ifdef HAVE_PATHS_H
# include <paths.h> # include <paths.h>
#endif #endif
@ -598,9 +600,11 @@ dnl wtmpx detection
AC_MSG_CHECKING([if your system defines WTMPX_FILE]) AC_MSG_CHECKING([if your system defines WTMPX_FILE])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h> #include <sys/types.h>
#include <utmp.h> #ifdef HAVE_UTMP_H
# include <utmp.h>
#endif
#ifdef HAVE_UTMPX_H #ifdef HAVE_UTMPX_H
#include <utmpx.h> # include <utmpx.h>
#endif #endif
#ifdef HAVE_PATHS_H #ifdef HAVE_PATHS_H
# include <paths.h> # include <paths.h>

8
loginrec.h
View File

@ -73,16 +73,16 @@
#else #else
/* Simply select your favourite login types. */ /* Simply select your favourite login types. */
/* Can't do if-else because some systems use several... <sigh> */ /* Can't do if-else because some systems use several... <sigh> */
# if defined(UTMPX_FILE) && !defined(DISABLE_UTMPX) # if defined(HAVE_UTMPX_H) && defined(UTMPX_FILE) && !defined(DISABLE_UTMPX)
# define USE_UTMPX # define USE_UTMPX
# endif # endif
# if defined(UTMP_FILE) && !defined(DISABLE_UTMP) # if defined(HAVE_UTMP_H) && defined(UTMP_FILE) && !defined(DISABLE_UTMP)
# define USE_UTMP # define USE_UTMP
# endif # endif
# if defined(WTMPX_FILE) && !defined(DISABLE_WTMPX) # if defined(HAVE_WTMPX_H) && defined(WTMPX_FILE) && !defined(DISABLE_WTMPX)
# define USE_WTMPX # define USE_WTMPX
# endif # endif
# if defined(WTMP_FILE) && !defined(DISABLE_WTMP) # if defined(HAVE_WTMP_H) && defined(WTMP_FILE) && !defined(DISABLE_WTMP)
# define USE_WTMP # define USE_WTMP
# endif # endif