hfingerd

commit 5c74dd29dfeffe48ea884c676705431f593f6114
parent ac7c88fc13a04eb9a096e1adebbbfb35aa3498df
Author: hhvn <dev@hhvn.uk>
Date:   Sun,  6 Jun 2021 01:42:56 +0100

main.c makefile strlcpy.c: strip /W requests

Diffstat:
M
main.c
 | 
5
+++++
M
makefile
 | 
2
+-
A
strlcpy.c
 | 
52
++++++++++++++++++++++++++++++++++++++++++++++++++++

3 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/main.c b/main.c
@@ -117,6 +117,11 @@ handoff(int fd) {
 	char user[1024];
 
 	read_line(fd, user, sizeof(user));
+	if (strncmp(user, "/W", strlen("/W")) == 0) {
+		verbose("Stripping user of /W prefix\n");
+		strlcpy(user, &user[3], sizeof(user));
+		/* 3 elems are guaranted: /W<null> */
+	}
 
 	if (user[0] == '\0')
 		get_userlist(fd);
diff --git a/makefile b/makefile
@@ -1,6 +1,6 @@
 PREFIX	= /usr/local
 CC	?= cc
-OBJ	= main.o handler.o
+OBJ	= main.o handler.o strlcpy.o
 BIN	= hfingerd
 COMMIT  = `git log HEAD...HEAD~1 --pretty=format:%h`
 
diff --git a/strlcpy.c b/strlcpy.c
@@ -0,0 +1,52 @@
+#ifndef __OpenBSD__
+/*	$OpenBSD: strlcpy.c,v 1.16 2019/01/25 00:19:25 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * Copy string src to buffer dst of size dsize.  At most dsize-1
+ * chars will be copied.  Always NUL terminates (unless dsize == 0).
+ * Returns strlen(src); if retval >= dsize, truncation occurred.
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t dsize)
+{
+	const char *osrc = src;
+	size_t nleft = dsize;
+
+	/* Copy as many bytes as will fit. */
+	if (nleft != 0) {
+		while (--nleft != 0) {
+			if ((*dst++ = *src++) == '\0')
+				break;
+		}
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src. */
+	if (nleft == 0) {
+		if (dsize != 0)
+			*dst = '\0';		/* NUL-terminate dst */
+		while (*src++)
+			;
+	}
+
+	return(src - osrc - 1);	/* count does not include NUL */
+}
+#endif