Merge branch '2.3' into develop

CMakeLists.txt

@@ -27,6 +27,10 @@ project(MaxScale)
 # Set the installation layout
 include(${CMAKE_SOURCE_DIR}/cmake/install_layout.cmake)
 
+# Configure RPATH
+# (it has to be before any executable generation)
+include(cmake/rpath.cmake)
+
 # Do the platform check
 include(cmake/CheckPlatform.cmake)
 
@@ -94,8 +98,6 @@ else()
   set(MAXSCALE_COMMIT "source-build")
 endif()
 
-set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR})
-
 # Make sure the release notes for this release are present if it is a stable one
 if(${MAXSCALE_VERSION} MATCHES "-stable")
   file(GLOB ${CMAKE_SOURCE_DIR}/Documentation/Release-Notes RELEASE_NOTES *${MAXSCALE_VERSION_NUMERIC}*.md)

cmake/package_tgz.cmake

@@ -1,6 +1,5 @@
 # Tarball package configuration
 message(STATUS "Generating tar.gz packages")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 set(MAXSCALE_BINDIR /bin CACHE PATH "" FORCE)
 set(MAXSCALE_LIBDIR /lib/maxscale CACHE PATH "" FORCE)
 set(MAXSCALE_SHAREDIR /share CACHE PATH "" FORCE)
@@ -8,7 +7,6 @@ set(MAXSCALE_DOCDIR /share CACHE PATH "" FORCE)
 set(MAXSCALE_VARDIR /var CACHE PATH "" FORCE)
 set(MAXSCALE_CONFDIR /etc CACHE PATH "" FORCE)
 set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "" FORCE)
-set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/maxscale/" CACHE PATH "" FORCE)
 set(CMAKE_INSTALL_DATADIR /share CACHE PATH "" FORCE)
 set(DEFAULT_LIB_SUBPATH /lib/maxscale CACHE PATH "" FORCE)
 set(DEFAULT_LIBDIR "/usr/local/maxscale/lib/maxscale" CACHE PATH "" FORCE)

cmake/rpath.cmake

@@ -0,0 +1,8 @@
+if(PACKAGE AND TARBALL)
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/maxscale" CACHE PATH "" FORCE)
+else()
+  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR})
+endif()
+
+

maxctrl/package-lock.json

@@ -1105,10 +1105,9 @@
       "dev": true
     },
     "handlebars": {
-      "version": "4.1.1",
+      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
-      "integrity": "sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==",
+      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
-      "dev": true,
       "requires": {
         "neo-async": "^2.6.0",
         "optimist": "^0.6.1",
@@ -1119,8 +1118,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-          "dev": true
         }
       }
     },
@@ -1855,8 +1853,7 @@
     "neo-async": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz",
-      "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
+      "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA=="
-      "dev": true
     },
     "normalize-package-data": {
       "version": "2.5.0",
@@ -4494,7 +4491,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "dev": true,
       "requires": {
         "minimist": "~0.0.1",
         "wordwrap": "~0.0.2"
@@ -5250,10 +5246,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.5.4",
+      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.10.tgz",
-      "integrity": "sha512-GpKo28q/7Bm5BcX9vOu4S46FwisbPbAmkkqPnGIpKvKTM96I85N6XHQV+k4I6FA2wxgLhcsSyHoNhzucwCflvA==",
+      "integrity": "sha512-/GTF0nosyPLbdJBd+AwYiZ+Hu5z8KXWnO0WCGt1BQ/u9Iamhejykqmz5o1OHJ53+VAk6xVxychonnApDjuqGsw==",
-      "dev": true,
       "optional": true,
       "requires": {
         "commander": "~2.20.0",
@@ -5264,14 +5259,12 @@
           "version": "2.20.0",
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
           "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
-          "dev": true,
           "optional": true
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
           "optional": true
         }
       }
@@ -5402,8 +5395,7 @@
     "wordwrap": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-      "dev": true
     },
     "wrap-ansi": {
       "version": "2.1.0",

server/core/test/test_adminusers.cc

@@ -232,7 +232,7 @@ int main(int argc, char** argv)
     /** Set datadir to /tmp */
     set_datadir(MXS_STRDUP_A("/tmp"));
 
-    /* Unlink any existing password file before running this test */
+    /* Unlink any existing password files before running this test */
     sprintf(buf, "%s/maxadmin-users", get_datadir());
     if (!is_valid_posix_path(buf))
     {
@@ -241,6 +241,14 @@ int main(int argc, char** argv)
 
     unlink(buf);
 
+    sprintf(buf, "%s/passwd", get_datadir());
+    if (!is_valid_posix_path(buf))
+    {
+        exit(1);
+    }
+
+    unlink(buf);
+
     admin_users_init();
     result += test1();
     result += test2();