Merge lp:~bregma/unity/lp-1413790-trusty into lp:unity/7.2

[Stephen M. Webb]

made unity unlockable if user is in nopsswdlogin group

Make unity unlockable if user is in nopsswdlogin group. On super+l the screensaver is activated.

Cherry-picked from trunk.

[Christopher Townsend (townsend)]

+1

review: Approve

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2014-12-16 19:27:36 +0000
+++ UnityCore/GnomeSessionManager.cpp	2015-03-11 19:28:23 +0000
@@ -22,6 +22,8 @@
 #include <NuxCore/Logger.h>
 #include "Variant.h"
 
+#include <grp.h>
+
 namespace unity
 {
 namespace session
@@ -483,6 +485,18 @@
   return inhibitors.GetBool();
 }
 
+bool GnomeManager::Impl::IsUserInGroup(std::string const& user_name, std::string const& group_name)
+{
+  auto group = getgrnam(group_name.c_str());
+
+  if (group && group->gr_mem)
+    for (int i = 0; group->gr_mem[i]; ++i)
+      if (g_strcmp0(group->gr_mem[i], user_name.c_str()) == 0)
+        return true;
+
+  return false;
+}
+
 // Public implementation
 
 GnomeManager::GnomeManager()
@@ -651,7 +665,8 @@
   glib::Object<GSettings> lockdown_settings(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));
 
   if (g_settings_get_boolean(lockdown_settings, DISABLE_LOCKSCREEN_KEY.c_str()) ||
-      UserName().find("guest-") == 0 || is_locked())
+      UserName().find("guest-") == 0 ||
+      impl_->IsUserInGroup(UserName(), "nopasswdlogin"))
   {
     return false;
   }

=== modified file 'UnityCore/GnomeSessionManagerImpl.h'
--- UnityCore/GnomeSessionManagerImpl.h	2014-07-23 18:56:11 +0000
+++ UnityCore/GnomeSessionManagerImpl.h	2015-03-11 19:28:23 +0000
@@ -64,6 +64,8 @@
   bool InteractiveMode();
   void UpdateHaveOtherOpenSessions();
 
+  bool IsUserInGroup(std::string const& user_name, std::string const& group_name);
+
   GnomeManager* manager_;
   bool test_mode_;
   bool can_shutdown_;