From fc80c0ea8c2aa927355cb5e1a52d641575a491d8 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Fri, 14 Jun 2019 22:35:06 +0200
Subject: [PATCH] [538-kea-should-not-store-anything-in-var-kea-lsb-violation]
 Addressed comments (and grep reports)

---
 Makefile.am                         | 3 ++-
 doc/examples/kea4/hooks.json        | 2 +-
 doc/examples/kea6/hooks.json        | 2 +-
 src/bin/keactrl/kea-dhcp4.conf.pre  | 2 +-
 src/lib/dhcpsrv/memfile_lease_mgr.h | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index edda59f94e..4c55349658 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -161,7 +161,8 @@ gen-docs:
 # These steps are necessary during installation
 install-exec-hook:
 	mkdir -p $(DESTDIR)${localstatedir}/log/
-	mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME}
+	mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
+	mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
 
 EXTRA_DIST  = tools/path_replacer.sh
 EXTRA_DIST += tools/mk_cfgrpt.sh
diff --git a/doc/examples/kea4/hooks.json b/doc/examples/kea4/hooks.json
index c8486ef062..9006c7661e 100644
--- a/doc/examples/kea4/hooks.json
+++ b/doc/examples/kea4/hooks.json
@@ -39,7 +39,7 @@
      {
          "library": "/opt/lib/charging.so",
          "parameters": {
-             "path": "/var/kea/var",
+             "path": "/var/lib/kea",
              "base-name": "kea-forensic6"
          }
      }
diff --git a/doc/examples/kea6/hooks.json b/doc/examples/kea6/hooks.json
index 046751f230..a930e2e9ba 100644
--- a/doc/examples/kea6/hooks.json
+++ b/doc/examples/kea6/hooks.json
@@ -47,7 +47,7 @@
      {
         "library": "/opt/lib/charging.so",
         "parameters": {
-             "path": "/var/kea/var",
+             "path": "/var/lib/kea",
              "base-name": "kea-forensic6"
         }
      }
diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre
index 60d396e242..ccfdba53f6 100644
--- a/src/bin/keactrl/kea-dhcp4.conf.pre
+++ b/src/bin/keactrl/kea-dhcp4.conf.pre
@@ -254,7 +254,7 @@
     //      // when they were active etc.
     //      "library": "@libdir@/kea/hooks/libdhcp_legal_log.so"
     //      "parameters": {
-    //          "path": "/var/kea/var",
+    //          "path": "/var/lib/kea",
     //          "base-name": "kea-forensic4"
     //      }
     //  },
diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h
index bffcecf69d..3953b3e6ce 100644
--- a/src/lib/dhcpsrv/memfile_lease_mgr.h
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.h
@@ -72,8 +72,8 @@ class LFCSetup;
 /// parameter in the database access string. The [path] is the
 /// absolute path to the file (including file name). If this parameter
 /// is not specified, the default location in the installation
-/// directory is used: var/kea/kea-leases4.csv and
-/// var/kea/kea-leases6.csv.
+/// directory is used: <install-dir>/var/lib/kea/kea-leases4.csv and
+/// <install-dir>/var/lib/kea/kea-leases6.csv.
 class Memfile_LeaseMgr : public LeaseMgr {
 public:
 
-- 
2.47.2