X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=klibc_fixups.c;h=99460c32f71240ce08a9c5fad00c9954427206e9;hb=d5f91372dd3241f8b4bbe2a99aaaeda541a76bad;hp=927f2f649a671762c1943ef68189f768b73a8054;hpb=82962619c626edfc68d39f0b179a909dd3dd0a6b;p=elogind.git

diff --git a/klibc_fixups.c b/klibc_fixups.c
index 927f2f649..99460c32f 100644
--- a/klibc_fixups.c
+++ b/klibc_fixups.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#include <fcntl.h>
 #include <sys/types.h>
 
 #include "klibc_fixups.h"
@@ -32,6 +33,8 @@
 
 #define PW_FILE		"/etc/passwd"
 #define GR_FILE		"/etc/group"
+#define UTMP_FILE	"/var/run/utmp"
+
 
 /* return the id of a passwd style line, selected by the users name */
 static unsigned long get_id_by_name(const char *uname, const char *dbfile)
@@ -71,7 +74,7 @@ static unsigned long get_id_by_name(const char *uname, const char *dbfile)
 
 		if (strcmp(uname, name) == 0) {
 			id = strtoul(idstr, &tail, 10);
-			if (tail == NULL)
+			if (tail[0] != '\0')
 				id = -1;
 			else
 				dbg("id for '%s' is '%li'", name, id);
@@ -107,4 +110,38 @@ struct group *getgrnam(const char *name)
 		return &gr;
 }
 
+
+int ufd = -1;
+
+void setutent()
+{
+	if (ufd < 0)
+		ufd = open(UTMP_FILE, O_RDONLY);
+	fcntl(ufd, F_SETFD, FD_CLOEXEC);
+	lseek(ufd, 0, SEEK_SET);
+}
+
+void endutent() {
+	if (ufd < 0)
+		return;
+	close(ufd);
+	ufd = -1;
+}
+
+struct utmp *getutent(void)
+{
+	static struct utmp utmp;
+	int retval;
+
+	if (ufd < 0) {
+		setutent();
+		if (ufd < 0)
+			return NULL;
+	}
+	retval = read(ufd, &utmp, sizeof(struct utmp));
+	if (retval < 1)
+		return NULL;
+	return &utmp;
+}
+
 #endif