diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-04-08 01:43:15 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-04-13 22:35:48 +0300 |
commit | 235618c7396902842906bc3a8c90a3320aeeaeba (patch) | |
tree | 27cb132ef7a799804c6b71be460cc8e718c7dcce /meta-openbmc-mods/meta-common/recipes-phosphor/users | |
parent | ee6f67609223ac24c3e4f55ae7cc78c60a3fdb34 (diff) | |
download | openbmc-235618c7396902842906bc3a8c90a3320aeeaeba.tar.xz |
Update to internal 0.47
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/users')
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager/0006-Use-groupmems-instead-of-getgrnam_r-due-to-overlay.patch | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager/0006-Use-groupmems-instead-of-getgrnam_r-due-to-overlay.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager/0006-Use-groupmems-instead-of-getgrnam_r-due-to-overlay.patch index 12a2bda3e..91087a155 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager/0006-Use-groupmems-instead-of-getgrnam_r-due-to-overlay.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager/0006-Use-groupmems-instead-of-getgrnam_r-due-to-overlay.patch @@ -20,15 +20,16 @@ both getgrnam_r & groupmems and able to see proper list only in groupmems when the issue is reproduced Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com> +Signed-off-by: jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> --- - user_service.cpp | 26 +++++++++++--------------- - 1 file changed, 11 insertions(+), 15 deletions(-) + user_service.cpp | 28 +++++++++++++--------------- + 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/user_service.cpp b/user_service.cpp -index c3c45bd..4fdf7a1 100644 +index c3c45bd..0a6b171 100644 --- a/user_service.cpp +++ b/user_service.cpp -@@ -143,28 +143,24 @@ class ShadowService : public phosphor::user::UserServiceInterface +@@ -143,28 +143,26 @@ class ShadowService : public phosphor::user::UserServiceInterface getUsersInGroup(const std::string &groupName) const override { std::vector<std::string> usersInGroup; @@ -63,11 +64,13 @@ index c3c45bd..4fdf7a1 100644 + } + if (!output.empty()) + { ++ boost::algorithm::trim_right(output[0]); + boost::algorithm::split(usersInGroup, output[0], -+ boost::algorithm::is_any_of(" ")); ++ boost::algorithm::is_any_of("\t "), ++ boost::token_compress_on); } return usersInGroup; } -- -2.7.4 +2.17.1 |