[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 12:36:58
Message-ID: 1197635818.131956.13187.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 748415 by ossi:

proper check for ut_host instead of weird os #ifdefs


 M  +1 -0      ConfigureChecks.cmake  
 M  +3 -7      backend/sessreg.c  


--- trunk/KDE/kdebase/workspace/kdm/ConfigureChecks.cmake #748414:748415
@@ -3,6 +3,7 @@
 
 check_struct_member("struct passwd" "pw_expire" "pwd.h" HAVE_STRUCT_PASSWD_PW_EXPIRE)
 check_struct_member("struct utmp" "ut_user" "utmp.h" HAVE_STRUCT_UTMP_UT_USER)
+check_struct_member("struct utmp" "ut_host" "utmp.h" HAVE_STRUCT_UTMP_UT_HOST)
 
 check_include_files(lastlog.h HAVE_LASTLOG_H)
 check_include_files(termio.h HAVE_TERMIO_H)
--- trunk/KDE/kdebase/workspace/kdm/backend/sessreg.c #748414:748415
@@ -58,10 +58,6 @@
 # endif
 #endif
 
-#if !defined(__svr4__) && !defined(__QNX__)
-# define SESSREG_HOST
-#endif
-
 #ifdef BSD
 # if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
 /* *BSD doesn't like a ':0' type entry in utmp */
@@ -144,7 +140,7 @@
 #endif
 		left = 0;
 	} else {
-#ifdef SESSREG_HOST
+#ifdef HAVE_STRUCT_UTMP_UT_HOST
 # ifndef BSD_UTMP
 		if (pid)
 # endif
@@ -226,7 +222,7 @@
 		while (read( utmp, (char *)&entry, sizeof(entry) ) == sizeof(entry)) {
 			if (!strncmp( entry.ut_line, ut_ent.ut_line,
 			              sizeof(entry.ut_line) ))
-#  ifdef SESSREG_HOST
+#  ifdef HAVE_STRUCT_UTMP_UT_HOST
 				if (!strncmp( entry.ut_host, ut_ent.ut_host,
 				              sizeof(entry.ut_host) ))
 #  endif
@@ -243,7 +239,7 @@
 			slot = freeslot;
 	  found:
 
-#  ifdef SESSREG_HOST
+#  ifdef HAVE_STRUCT_UTMP_UT_HOST
 		if (!pid)
 			bzero( ut_ent.ut_host, sizeof(ut_ent.ut_host) );
 #  endif
[prev in list] [next in list] [prev in thread] [next in thread]