Merge lp:~azzar1/unity/lp-1413790 into lp:unity

[Andrea Azzarone]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3912
http://jenkins.qa.ubuntu.com/job/unity-ci/1143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1143/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

Approved as discussed.

review: Approve

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2015-01-14 00:10:20 +0000
+++ UnityCore/GnomeSessionManager.cpp	2015-01-24 00:58:29 +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()
@@ -654,7 +668,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-05-16 04:24:05 +0000
+++ UnityCore/GnomeSessionManagerImpl.h	2015-01-24 00:58:29 +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_;