From 6cecb4e4d24d068b1f7c55aa5a0a39e23494404a Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Thu, 30 Jan 2014 13:29:36 +0100
Subject: [PATCH] json dns: rename output-dnslog -> output-json-dns

---
 src/Makefile.am                            | 2 +-
 src/{output-dnslog.c => output-json-dns.c} | 1 -
 src/{output-dnslog.h => output-json-dns.h} | 6 +++---
 src/suricata.c                             | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename src/{output-dnslog.c => output-json-dns.c} (99%)
 rename src/{output-dnslog.h => output-json-dns.h} (89%)

diff --git a/src/Makefile.am b/src/Makefile.am
index ed1d285cd1..39cf72e4e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -217,6 +217,7 @@ output.c output.h \
 output-file.c output-file.h \
 output-filedata.c output-filedata.h \
 output-json-alert.c output-json-alert.h \
+output-json-dns.c output-json-dns.h \
 output-json-file.c output-json-file.h \
 output-json-http.c output-json-http.h \
 output-packet.c output-packet.h \
@@ -224,7 +225,6 @@ output-tx.c output-tx.h \
 output-droplog.c output-droplog.h \
 output-json.c output-json.h \
 output-tlslog.c output-tlslog.h \
-output-dnslog.c output-dnslog.h \
 packet-queue.c packet-queue.h \
 pkt-var.c pkt-var.h \
 reputation.c reputation.h \
diff --git a/src/output-dnslog.c b/src/output-json-dns.c
similarity index 99%
rename from src/output-dnslog.c
rename to src/output-json-dns.c
index 098ec197c5..7c990b9639 100644
--- a/src/output-dnslog.c
+++ b/src/output-json-dns.c
@@ -40,7 +40,6 @@
 #include "util-mem.h"
 #include "app-layer-parser.h"
 #include "output.h"
-#include "output-dnslog.h"
 #include "app-layer-dns-udp.h"
 #include "app-layer.h"
 #include "util-privs.h"
diff --git a/src/output-dnslog.h b/src/output-json-dns.h
similarity index 89%
rename from src/output-dnslog.h
rename to src/output-json-dns.h
index cc077ebfed..f26227e374 100644
--- a/src/output-dnslog.h
+++ b/src/output-json-dns.h
@@ -21,9 +21,9 @@
  * \author Tom DeCanio <td@npulsetech.com>
  */
 
-#ifndef __OUTPUT_DNSLOG_H__
-#define __OUTPUT_DNSLOG_H__
+#ifndef __OUTPUT_JSON_DNS_H__
+#define __OUTPUT_JSON_DNS_H__
 
 void TmModuleJsonDnsLogRegister (void);
 
-#endif /* __OUTPUT_DNSLOG_H__ */
+#endif /* __OUTPUT_JSON_DNS_H__ */
diff --git a/src/suricata.c b/src/suricata.c
index 8f31ea7476..2d687e4331 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -85,7 +85,7 @@
 #include "log-httplog.h"
 #include "output-json-http.h"
 #include "log-dnslog.h"
-#include "output-dnslog.h"
+#include "output-json-dns.h"
 #include "log-tlslog.h"
 #include "output-tlslog.h"
 #include "log-pcap.h"