commit 2cb2e7208e512de2cc6be5361ec6aed480079eb4
author Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com> Thu Sep 27 14:22:42 2018 +0530
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Mon Oct 01 20:01:51 2018 -0400
tree fa9d08f3dd45801b49392175f62342b6463f8f81
parent 9f630d9eb0ce1c103532a4304ea080066199094e

Handle empty privilege condition

This fixes issue, which may end up adding "," in the groups
list, when privilege is empty. Allow adding privilege to the
groups list only when it is not empty

Change-Id: I42607c4835547eda4989f85521148a2716bedcb6
Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>

user_mgr.cpp

diff --git a/user_mgr.cpp b/user_mgr.cpp
index 3987088..ebed493 100644
--- a/user_mgr.cpp
+++ b/user_mgr.cpp
@@ -263,12 +263,14 @@
 
     // treat privilege as a group - This is to avoid using different file to
     // store the same.
-    if (groups.size() != 0)
+    if (!priv.empty())
     {
-        groups += ",";
+        if (groups.size() != 0)
+        {
+            groups += ",";
+        }
+        groups += priv;
     }
-    groups += priv;
-
     try
     {
         executeCmd("/usr/sbin/useradd", userName.c_str(), "-G", groups.c_str(),
@@ -381,11 +383,14 @@
 
     // treat privilege as a group - This is to avoid using different file to
     // store the same.
-    if (groups.size() != 0)
+    if (!priv.empty())
     {
-        groups += ",";
+        if (groups.size() != 0)
+        {
+            groups += ",";
+        }
+        groups += priv;
     }
-    groups += priv;
     try
     {
         executeCmd("/usr/sbin/usermod", userName.c_str(), "-G", groups.c_str(),