From 6f0ca120d1ab80246bc57927f7520a425daad787 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Wed, 7 Dec 2011 19:24:57 +0100
Subject: [PATCH] Make sure existing log-pcap and unified2-alert 'limit'
 settings don't break.

---
 src/alert-unified2-alert.c | 9 +++++++--
 src/log-pcap.c             | 7 ++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index 8e48e9ec1e..aebfa8b779 100644
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -1179,7 +1179,12 @@ OutputCtx *Unified2AlertInitCtx(ConfNode *conf)
                     s_limit);
                 exit(EXIT_FAILURE);
             }
-            if (file_ctx->size_limit < MIN_LIMIT) {
+            if (file_ctx->size_limit < 4096) {
+                SCLogInfo("unified2-alert \"limit\" value of %"PRIu64" assumed to be pre-1.2 "
+                        "style: setting limit to %"PRIu64"mb", file_ctx->size_limit, file_ctx->size_limit);
+                uint64_t size = file_ctx->size_limit * 1024 * 1024;
+                file_ctx->size_limit = size;
+            } else if (file_ctx->size_limit < MIN_LIMIT) {
                 SCLogError(SC_ERR_INVALID_ARGUMENT,
                     "Failed to initialize unified2 output, limit less than "
                     "allowed minimum: %d.", MIN_LIMIT);
@@ -1199,7 +1204,7 @@ OutputCtx *Unified2AlertInitCtx(ConfNode *conf)
     output_ctx->DeInit = Unified2AlertDeInitCtx;
 
     SCLogInfo("Unified2-alert initialized: filename %s, limit %"PRIu64" MB",
-              filename, file_ctx->size_limit);
+              filename, file_ctx->size_limit / (1024*1024));
 
     SC_ATOMIC_INIT(unified2_event_id);
 
diff --git a/src/log-pcap.c b/src/log-pcap.c
index 62b598eed5..8d42c97bef 100644
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -436,7 +436,12 @@ OutputCtx *PcapLogInitCtx(ConfNode *conf)
                     s_limit);
                 exit(EXIT_FAILURE);
             }
-            if (pl->size_limit < MIN_LIMIT) {
+            if (pl->size_limit < 4096) {
+                SCLogInfo("pcap-log \"limit\" value of %"PRIu64" assumed to be pre-1.2 "
+                        "style: setting limit to %"PRIu64"mb", pl->size_limit, pl->size_limit);
+                uint64_t size = pl->size_limit * 1024 * 1024;
+                pl->size_limit = size;
+            } else if (pl->size_limit < MIN_LIMIT) {
                 SCLogError(SC_ERR_INVALID_ARGUMENT,
                     "Fail to initialize pcap-log output, limit less than "
                     "allowed minimum.");