From 9f9610327c6b5dd3f738b6dddcc77646376d9fd9 Mon Sep 17 00:00:00 2001
From: Håkon Nessjøen <haakon.nessjoen@gmail.com>
Date: Sun, 27 Feb 2011 15:09:56 +0100
Subject: Add foreground mode support for mactelnetd.

---
 config/mactelnetd.users |  5 +++++
 mactelnetd.c            | 23 +++++++++++++++--------
 mactelnetd.users        |  5 -----
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 config/mactelnetd.users
 delete mode 100644 mactelnetd.users

diff --git a/config/mactelnetd.users b/config/mactelnetd.users
new file mode 100644
index 0000000..7b215e1
--- /dev/null
+++ b/config/mactelnetd.users
@@ -0,0 +1,5 @@
+# Users file for MAC-Telnetd
+# Use existing usernames from your system
+#
+# Format:
+#username:password
diff --git a/mactelnetd.c b/mactelnetd.c
index 0654009..c2460f7 100644
--- a/mactelnetd.c
+++ b/mactelnetd.c
@@ -815,9 +815,13 @@ int main (int argc, char **argv) {
 	fd_set read_fds;
 	int c,optval = 1;
 	int print_help = 0;
+	int foreground = 0;
 
-	while ((c = getopt(argc, argv, "nvh?")) != -1) {
+	while ((c = getopt(argc, argv, "fnvh?")) != -1) {
 		switch (c) {
+			case 'f':
+				foreground = 1;
+				break;
 
 			case 'n':
 				use_raw_socket = 1;
@@ -838,10 +842,11 @@ int main (int argc, char **argv) {
 
 	if (print_help) {
 		print_version();
-		fprintf(stderr, "Usage: %s [-n] [-h]\n", argv[0]);
+		fprintf(stderr, "Usage: %s [-f|-n|-h]\n", argv[0]);
 
 		if (print_help) {
 			fprintf(stderr, "\nParameters:\n");
+			fprintf(stderr, "  -f        Run process in foreground.\n");
 			fprintf(stderr, "  -n        Do not use broadcast packets. Just a tad less insecure.\n");
 			fprintf(stderr, "  -h        This help.\n");
 			fprintf(stderr, "\n");
@@ -849,17 +854,17 @@ int main (int argc, char **argv) {
 		return 1;
 	}
 
+	if (geteuid() != 0) {
+		fprintf(stderr, "You need to have root privileges to use %s.\n", argv[0]);
+		return 1;
+	}
+
 	/* Try to read user file */
 	read_userfile();
 
 	/* Seed randomizer */
 	srand(time(NULL));
 
-	if (geteuid() != 0) {
-		fprintf(stderr, "You need to have root privileges to use %s.\n", argv[0]);
-		return 1;
-	}
-
 	if (use_raw_socket) {
 		/* Transmit raw packets with this socket */
 		sockfd = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
@@ -922,7 +927,9 @@ int main (int argc, char **argv) {
 
 	setup_sockets();
 
-	daemonize();
+	if (!foreground) {
+		daemonize();
+	}
 
 	openlog("mactelnetd", LOG_PID, LOG_DAEMON);
 
diff --git a/mactelnetd.users b/mactelnetd.users
deleted file mode 100644
index 7b215e1..0000000
--- a/mactelnetd.users
+++ /dev/null
@@ -1,5 +0,0 @@
-# Users file for MAC-Telnetd
-# Use existing usernames from your system
-#
-# Format:
-#username:password
-- 
cgit v1.2.3