Commit d13e6766 authored by Robert Graham's avatar Robert Graham
Browse files

merged conflicts

parents 79039385 5737ea54
Loading
Loading
Loading
Loading
+1 −1
Changes for Makefile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
#use llvm by default, GNU C otherwise
CC=$(shell which clang || which gcc)
CC=gcc

PREFIX ?= /usr
BINDIR ?= $(PREFIX)/bin
+2 −2
Changes for src/templ-payloads.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ struct Payload2 hard_coded_payloads[] = {
        /* 02 */"\x01\x20"  /* quer y*/
        /* 04 */"\x00\x01"  /* query = 1 */
        /* 06 */"\x00\x00\x00\x00\x00\x00"
        /* 0c */"\x07" "version"  "\x04" "bind" "\xc0\x1b"
        /* 1b */"\x00\x10" /* TXT */            /*^^^^^^^_____IDS LULZ HAH HA HAH*/
        /* 0c */"\x07" "version"  "\x04" "bind" "\x00"
        /* 1b */"\x00\x10" /* TXT */           
        /* 1d */"\x00\x03" /* CHAOS */
        /* 1f */
    },