diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-06-12 02:56:58 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-06-12 03:00:32 +0200 |
| commit | 46b20a55775c6c44591ff2d2d423399887ebc806 (patch) | |
| tree | 6e2264bf4578861f4adacce599e43a63441a7a0c /tdm/backend | |
| parent | 32eee8cad4fd7bf38b98e5c8db0455bed75e03bc (diff) | |
| download | tdebase-46b20a55775c6c44591ff2d2d423399887ebc806.tar.gz tdebase-46b20a55775c6c44591ff2d2d423399887ebc806.zip | |
Fix FTBFS on freebsd
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 08122b137e76ffcf7067f634a7668002732e11d9)
Diffstat (limited to 'tdm/backend')
| -rw-r--r-- | tdm/backend/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdm/backend/dm.h | 8 | ||||
| -rw-r--r-- | tdm/backend/getfd.c | 2 | ||||
| -rw-r--r-- | tdm/backend/sessreg.c | 9 |
4 files changed, 15 insertions, 6 deletions
diff --git a/tdm/backend/CMakeLists.txt b/tdm/backend/CMakeLists.txt index 9f9d0430f..da3f3ac03 100644 --- a/tdm/backend/CMakeLists.txt +++ b/tdm/backend/CMakeLists.txt @@ -43,6 +43,6 @@ tde_add_executable( tdm process.c protodpy.c reset.c resource.c rpcauth.c server.c session.c sessreg.c socket.c streams.c util.c xdmauth.c xdmcp.c - LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES} + LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${UTIL_LIBRARY} ${XDMCP_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdm/backend/dm.h b/tdm/backend/dm.h index c05d4c865..ae731aeca 100644 --- a/tdm/backend/dm.h +++ b/tdm/backend/dm.h @@ -106,7 +106,6 @@ typedef int waitType; # define Jmp_buf sigjmp_buf #endif -#include <utmp.h> #ifdef HAVE_UTMPX # include <utmpx.h> # define STRUCTUTMP struct utmpx @@ -119,6 +118,7 @@ typedef int waitType; # define ut_time ut_tv.tv_sec # define ll_time ll_tv.tv_sec #else +# include <utmp.h> # define STRUCTUTMP struct utmp # define UTMPNAME utmpname # define SETUTENT setutent @@ -126,9 +126,9 @@ typedef int waitType; # define PUTUTLINE pututline # define ENDUTENT endutent # define LASTLOG lastlog -#endif -#ifndef HAVE_STRUCT_UTMP_UT_USER -# define ut_user ut_name +# ifndef HAVE_STRUCT_UTMP_UT_USER +# define ut_user ut_name +# endif #endif #ifndef WTMP_FILE # ifdef _PATH_WTMPX diff --git a/tdm/backend/getfd.c b/tdm/backend/getfd.c index 307b2501c..d4f4d8352 100644 --- a/tdm/backend/getfd.c +++ b/tdm/backend/getfd.c @@ -22,7 +22,7 @@ is_a_console(int fd) { char arg; arg = 0; -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__FreeBSD__) return arg; #else return (ioctl(fd, KDGKBTYPE, &arg) == 0 diff --git a/tdm/backend/sessreg.c b/tdm/backend/sessreg.c index b507f8141..4167a16e3 100644 --- a/tdm/backend/sessreg.c +++ b/tdm/backend/sessreg.c @@ -42,6 +42,13 @@ from The Open Group. #if defined(__svr4__) || defined(__Lynx__) || defined(__QNX__) || defined(__APPLE__) || defined(_SEQUENT_) /*|| defined(USE_PAM)*/ # define NO_LASTLOG #endif + +#ifdef __FreeBSD__ +# include <sys/param.h> +# if __FreeBSD_version >= 900007 +# define NO_LASTLOG +# endif +#endif #ifndef NO_LASTLOG # ifdef HAVE_LASTLOG_H @@ -254,7 +261,9 @@ sessreg( struct display *d, int pid, const char *user, int uid ) close( utmp ); } # else +# if !defined(__FreeBSD__) UTMPNAME( UTMP_FILE ); +# endif SETUTENT(); PUTUTLINE( &ut_ent ); ENDUTENT(); |