[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2007-12-14 15:42:03
Message-ID: 1197646923.821598.19436.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 748469 by ossi:

separate lastlogx from utmpx detection.
still not sure about the ugly NO_LASTLOG magic.
CCMAIL: groot@kde.org


 M  +2 -0      ConfigureChecks.cmake  
 M  +0 -2      backend/dm.h  
 M  +6 -2      backend/sessreg.c  
 M  +3 -0      config-kdm.h.cmake  


--- trunk/KDE/kdebase/workspace/kdm/ConfigureChecks.cmake #748468:748469
@@ -72,8 +72,10 @@
 
 if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR \
CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD)  set(HAVE_UTMPX)
+	set(HAVE_LASTLOGX)
 else (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR \
CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD)  check_function_exists(getutxent HAVE_UTMPX)
+	check_function_exists(updlastlogx HAVE_LASTLOGX)
 endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR \
CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD)  set(BSD_UTMP)
 if (NOT HAVE_UTMPX)
--- trunk/KDE/kdebase/workspace/kdm/backend/dm.h #748468:748469
@@ -111,7 +111,6 @@
 # define GETUTENT getutxent
 # define PUTUTLINE pututxline
 # define ENDUTENT endutxent
-# define LASTLOG lastlogx
 # define ut_time ut_tv.tv_sec
 # define ll_time ll_tv.tv_sec
 #else
@@ -121,7 +120,6 @@
 # define GETUTENT getutent
 # define PUTUTLINE pututline
 # define ENDUTENT endutent
-# define LASTLOG lastlog
 #endif
 #ifndef HAVE_STRUCT_UTMP_UT_USER
 # define ut_user ut_name
--- trunk/KDE/kdebase/workspace/kdm/backend/sessreg.c #748468:748469
@@ -111,8 +111,12 @@
 	int wtmp;
 #endif
 #ifndef NO_LASTLOG
+# ifdef HAVE_LASTLOGX
+	struct lastlogx ll;
+# else
 	int llog;
-	struct LASTLOG ll;
+	struct lastlog ll;
+# endif
 #endif
 	STRUCTUTMP ut_ent;
 
@@ -281,7 +285,7 @@
 		ll.ll_time = ut_ent.ut_time;
 		memcpy( ll.ll_line, ut_ent.ut_line, sizeof(ll.ll_line) );
 		memcpy( ll.ll_host, ut_ent.ut_host, sizeof(ll.ll_host) );
-# ifdef HAVE_UTMPX
+# ifdef HAVE_LASTLOGX
 		updlastlogx( LLOG_FILE, uid, &ll );
 # else
 		if ((llog = open( LLOG_FILE, O_RDWR )) < 0)
--- trunk/KDE/kdebase/workspace/kdm/config-kdm.h.cmake #748468:748469
@@ -72,6 +72,9 @@
 /* Define if the system uses extended utmp */
 #cmakedefine HAVE_UTMPX 1
 
+/* Define if the system uses extended lastlog */
+#cmakedefine HAVE_LASTLOGX 1
+
 /* Define if kdm should use Sun's secure RPC for Xauth cookies. */
 #cmakedefine SECURE_RPC 1
 


[prev in list] [next in list] [prev in thread] [next in thread]