neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes for new buildroot + cleanup from merge

This commit is contained in:
Neale Pickett 2011-09-21 15:23:09 -06:00
parent 24ea578807
commit d5976d4a2e
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/ctfbase/ctfbase.mk
View File

@ -2,11 +2,10 @@ CTFBASE_PKGDIR = $(TARGET)/ctfbase
ctfbase-install: ctfbase-build ctfbase-install: ctfbase-build
mkdir -p $(CTFBASE_PKGDIR)/bin/ mkdir -p $(CTFBASE_PKGDIR)/bin/
cp packages/ctfbase/src/arc4 $(CTFBASE_PKGDIR)/bin/
$(call COPYTREE, packages/ctfbase/service, $(CTFBASE_PKGDIR)/service) $(call COPYTREE, packages/ctfbase/service, $(CTFBASE_PKGDIR)/service)
cp packages/ctfbase/src/arc4 $(CTFBASE_PKGDIR)/bin/
ctfbase-clean: ctfbase-clean:
rm -rf $(CTFBASE_PKGDIR) rm -rf $(CTFBASE_PKGDIR)
$(MAKE) -C packages/ctfbase/src clean $(MAKE) -C packages/ctfbase/src clean

3
packages/ctfbase/service/ctfd/passwd
View File

@ -1,2 +1,3 @@
root:$1$bEGCYemG$pAo9KXWQKgQNijRGKSb7e1:0:0:root:/:/bin/ash 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

2
packages/ctfbase/service/ctfd/run
View File

@ -10,7 +10,7 @@ fi
# Set up networking for all CTF ips # Set up networking for all CTF ips
ip link set eth0 up ip link set eth0 up
if ! ip route | grep -q default; then 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 fi
install -o root -m 0755 -d /var/lib/ctf/tokens install -o root -m 0755 -d /var/lib/ctf/tokens

2
packages/mcp/mcp.mk
View File

@ -35,8 +35,6 @@ mcp-install: $(MCP_BUILDDIR)/build
$(call COPYTREE, packages/mcp/service, $(MCP_PKGDIR)/service) $(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) $(call COPYTREE, packages/mcp/www, $(MCP_PKGDIR)/www)
cp packages/mcp/src/puzzler.cgi $(MCP_PKGDIR)/www/ cp packages/mcp/src/puzzler.cgi $(MCP_PKGDIR)/www/
cp packages/mcp/src/claim.cgi $(MCP_PKGDIR)/www/ cp packages/mcp/src/claim.cgi $(MCP_PKGDIR)/www/

3
src/token.c
View File

@ -1,3 +1,4 @@
#define _GNU_SOURCE
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <limits.h> #include <limits.h>
@ -59,5 +60,5 @@ get_token(char *buf, size_t buflen,
while ('\n' == buf[l-1]) l -= 1; while ('\n' == buf[l-1]) l -= 1;
buf[l-1] = '\0'; buf[l-1] = '\0';
return l; return l;
} }