From e05683c7caf065f19ac07787353dafcae23d28d3 Mon Sep 17 00:00:00 2001
From: david hill <david.hill@mariadb.com>
Date: Wed, 18 Oct 2017 15:53:40 -0500
Subject: [PATCH] mcol-953 - fixed non-root user - use root user

---
 oam/oamcpp/liboamcpp.cpp             | 4 ++--
 oamapps/postConfigure/getMySQLpw.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index e2e2a7e42..7ae5d5bfe 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -8757,8 +8757,8 @@ namespace oam
 		while (file.getline(line, 400))
 		{
 			buf = line;
-	
-			string::size_type pos = buf.find(USER,0);
+			//find the mariadb user, root
+			string::size_type pos = buf.find("root",0);
 			if (pos != string::npos)
 			{
 				file.getline(line, 400);
diff --git a/oamapps/postConfigure/getMySQLpw.cpp b/oamapps/postConfigure/getMySQLpw.cpp
index fe6d84637..c47774af5 100644
--- a/oamapps/postConfigure/getMySQLpw.cpp
+++ b/oamapps/postConfigure/getMySQLpw.cpp
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 	{
 		buf = line;
 
-		string::size_type pos = buf.find(USER,0);
+		string::size_type pos = buf.find("root",0);
 		if (pos != string::npos)
 		{
 			file.getline(line, 400);