Attachment #103342 for bug #143236

View | Details | Raw Unified | Return to bug 143236
Collapse All | Expand All

Lines 23-28 Link Here

(-)plan/Makefile (-1 / +6 lines)
23		23
24	MAKE_ENV+= DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}	24	MAKE_ENV+= DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}
25		25
		26	.include <bsd.port.pre.mk>
		27	.if ${OSVERSION} > 900006
		28	EXTRA_PATCHES= ${PATCHDIR}/utmpx-src-daemon.c
		29	.endif
		30
26	do-install:	31	do-install:
27	@${MKDIR} ${EXAMPLESDIR}	32	@${MKDIR} ${EXAMPLESDIR}
28		33
Lines 54-57 Link Here
54	@${MKDIR} ${DATADIR}/netplan.dir	59	@${MKDIR} ${DATADIR}/netplan.dir
55	.endif	60	.endif
56		61
57	.include <bsd.port.mk>	62	.include <bsd.port.post.mk>




--- daemon.c.orig	2010-01-25 17:34:06.000000000 -0800
+++ daemon.c	2010-01-25 17:38:29.000000000 -0800
@@ -42,7 +42,7 @@
 #ifdef __EMX__
 #include <io.h>
 #else
-#include <utmp.h>
+#include <utmpx.h>
 #endif
 #ifdef AIXV3
 struct utmp *getutent();
@@ -266,7 +266,7 @@
 		refresh_lock(resolve_tilde(PLANDLOCK));
 		logged_in = FALSE;
 		if (pw) {
-#if defined(SUN) || defined(BSD) || defined(__FreeBSD__)
+#if defined(SUN)
 		    struct utmp	ut;
 		    int		fd;
 		    int		l;
@@ -289,9 +289,9 @@
 		    logged_in = TRUE;
 #else
 		    short pid = getpid();
-		    struct utmp *u;
-		    setutent();
-		    while ((u = getutent()))
+		    struct utmpx *u;
+		    setutxent();
+		    while ((u = getutxent()))
 			if (u->ut_type == USER_PROCESS &&
 			    u->ut_pid != pid &&
 			    !strncmp(pw->pw_name, u->ut_user, 8)) {

Return to bug 143236

Line 0 Link Here

(-)plan/files/utmpx-src-daemon.c (+33 lines)
	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)) {