From 5c870b3c6f5b8c479b5f50f505f4ed3a571e8014 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Wed, 21 Sep 2011 15:23:09 -0600
Subject: [PATCH] fixes for new buildroot + cleanup from merge

---
 packages/ctfbase/ctfbase.mk          | 3 +--
 packages/ctfbase/service/ctfd/passwd | 3 ++-
 packages/ctfbase/service/ctfd/run    | 2 +-
 packages/mcp/mcp.mk                  | 2 --
 src/token.c                          | 3 ++-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/ctfbase/ctfbase.mk b/packages/ctfbase/ctfbase.mk
index 30611cb..6a5f78d 100644
--- a/packages/ctfbase/ctfbase.mk
+++ b/packages/ctfbase/ctfbase.mk
@@ -2,11 +2,10 @@ CTFBASE_PKGDIR = $(TARGET)/ctfbase
 
 ctfbase-install: ctfbase-build
 	mkdir -p $(CTFBASE_PKGDIR)/bin/
+	cp packages/ctfbase/src/arc4 $(CTFBASE_PKGDIR)/bin/
 
 	$(call COPYTREE, packages/ctfbase/service, $(CTFBASE_PKGDIR)/service)
 
-	cp packages/ctfbase/src/arc4 $(CTFBASE_PKGDIR)/bin/
-
 ctfbase-clean:
 	rm -rf $(CTFBASE_PKGDIR)
 	$(MAKE) -C packages/ctfbase/src clean
diff --git a/packages/ctfbase/service/ctfd/passwd b/packages/ctfbase/service/ctfd/passwd
index 87eee46..b0ebfea 100644
--- a/packages/ctfbase/service/ctfd/passwd
+++ b/packages/ctfbase/service/ctfd/passwd
@@ -1,2 +1,3 @@
 root:$1$bEGCYemG$pAo9KXWQKgQNijRGKSb7e1:0:0:root:/:/bin/ash
-nobody:x:65534:65534:nobody:/:/bin/sh
+ctf:x:100:100:CTF Services:/:/bin/false
+nobody:x:65534:65534:nobody:/:/bin/false
diff --git a/packages/ctfbase/service/ctfd/run b/packages/ctfbase/service/ctfd/run
index 4e73720..462ed5d 100755
--- a/packages/ctfbase/service/ctfd/run
+++ b/packages/ctfbase/service/ctfd/run
@@ -10,7 +10,7 @@ fi
 # Set up networking for all CTF ips
 ip link set eth0 up
 if ! ip route | grep -q default; then
-    ip route add default via 10.0.0.1 || exit 1
+    ip route add default via fd82:b410:3441:1661::1 || exit 1
 fi
 
 install -o root -m 0755 -d /var/lib/ctf/tokens
diff --git a/packages/mcp/mcp.mk b/packages/mcp/mcp.mk
index 93e951e..19e6ef8 100644
--- a/packages/mcp/mcp.mk
+++ b/packages/mcp/mcp.mk
@@ -35,8 +35,6 @@ mcp-install: $(MCP_BUILDDIR)/build
 
 	$(call COPYTREE, packages/mcp/service, $(MCP_PKGDIR)/service)
 
-	$(call COPYTREE, packages/mcp/tokend.keys, $(MCP_PKGDIR)/tokend.keys)
-
 	$(call COPYTREE, packages/mcp/www, $(MCP_PKGDIR)/www)
 	cp packages/mcp/src/puzzler.cgi $(MCP_PKGDIR)/www/
 	cp packages/mcp/src/claim.cgi $(MCP_PKGDIR)/www/
diff --git a/src/token.c b/src/token.c
index b6d6c92..969e3d2 100644
--- a/src/token.c
+++ b/src/token.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdint.h>
 #include <limits.h>
@@ -59,5 +60,5 @@ get_token(char *buf, size_t buflen,
   while ('\n' == buf[l-1]) l -= 1;
   buf[l-1] = '\0';
 
-  return l;    
+  return l;
 }