Skip to content
Snippets Groups Projects
Commit d13e6766 authored by Robert Graham's avatar Robert Graham
Browse files

merged conflicts

parents 79039385 5737ea54
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Makefile
+ 1
− 1
View file @ d13e6766
#use llvm by default, GNU C otherwise #use llvm by default, GNU C otherwise
CC=$(shell which clang || which gcc) CC=gcc
PREFIX ?= /usr PREFIX ?= /usr
BINDIR ?= $(PREFIX)/bin BINDIR ?= $(PREFIX)/bin
......
src/templ-payloads.c
+ 2
− 2
View file @ d13e6766
...@@ -66,8 +66,8 @@ struct Payload2 hard_coded_payloads[] = { ...@@ -66,8 +66,8 @@ struct Payload2 hard_coded_payloads[] = {
/* 02 */"\x01\x20" /* quer y*/ /* 02 */"\x01\x20" /* quer y*/
/* 04 */"\x00\x01" /* query = 1 */ /* 04 */"\x00\x01" /* query = 1 */
/* 06 */"\x00\x00\x00\x00\x00\x00" /* 06 */"\x00\x00\x00\x00\x00\x00"
/* 0c */"\x07" "version" "\x04" "bind" "\xc0\x1b" /* 0c */"\x07" "version" "\x04" "bind" "\x00"
/* 1b */"\x00\x10" /* TXT */ /*^^^^^^^_____IDS LULZ HAH HA HAH*/ /* 1b */"\x00\x10" /* TXT */
/* 1d */"\x00\x03" /* CHAOS */ /* 1d */"\x00\x03" /* CHAOS */
/* 1f */ /* 1f */
}, },
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment