Line 0
Link Here
|
|
|
1 |
--- daemon.c.orig 2010-01-25 17:34:06.000000000 -0800 |
2 |
+++ daemon.c 2010-01-25 17:38:29.000000000 -0800 |
3 |
@@ -42,7 +42,7 @@ |
4 |
#ifdef __EMX__ |
5 |
#include <io.h> |
6 |
#else |
7 |
-#include <utmp.h> |
8 |
+#include <utmpx.h> |
9 |
#endif |
10 |
#ifdef AIXV3 |
11 |
struct utmp *getutent(); |
12 |
@@ -266,7 +266,7 @@ |
13 |
refresh_lock(resolve_tilde(PLANDLOCK)); |
14 |
logged_in = FALSE; |
15 |
if (pw) { |
16 |
-#if defined(SUN) || defined(BSD) || defined(__FreeBSD__) |
17 |
+#if defined(SUN) |
18 |
struct utmp ut; |
19 |
int fd; |
20 |
int l; |
21 |
@@ -289,9 +289,9 @@ |
22 |
logged_in = TRUE; |
23 |
#else |
24 |
short pid = getpid(); |
25 |
- struct utmp *u; |
26 |
- setutent(); |
27 |
- while ((u = getutent())) |
28 |
+ struct utmpx *u; |
29 |
+ setutxent(); |
30 |
+ while ((u = getutxent())) |
31 |
if (u->ut_type == USER_PROCESS && |
32 |
u->ut_pid != pid && |
33 |
!strncmp(pw->pw_name, u->ut_user, 8)) { |