← Back to branch summary

~ubuntu-branches/ubuntu/raring/accountsservice/raring

« back to all changes in this revision

Viewing changes to debian/patches/0001-do-not-consider-system-users-returned-from-consolekit.patch

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2011-03-19 10:39:28 UTC
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20110319103928-m0nbc2u28vs0sv06
Tags: 0.6.6-2
http://bugs.debian.org/618764
* Rename 0001-buildsystem.patch -> 1001-buildsystem.patch
* Match Debian user/groups system;
  thanks to Frederic Peters for the patchset (Closes: #618764):
  - 0001-do-not-consider-system-users-returned-from-consolekit.patch.
  - 0002-create-and-manage-groups-like-on-a-debian-system.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-do-not-consider-system-users-returned-from-consolekit.patch
 
1
From: Frederic Peters <fpeters@debian.org>
 
2
Bug-Debian: http://bugs.debian.org/618764
 
3
Description: Do not consider system users returned from consolekit history.
 
4
Forwarded: not-needed
 
5
---
 
6
 src/daemon.c |    5 ++++-
 
7
 1 files changed, 4 insertions(+), 1 deletions(-)
 
8
 
 
9
diff --git a/src/daemon.c b/src/daemon.c
 
10
index 32e9c97..a32276b 100644
 
11
--- a/src/daemon.c
 
12
+++ b/src/daemon.c
 
13
@@ -336,6 +336,7 @@ process_ck_history_line (Daemon      *daemon,
 
14
         gchar *username;
 
15
         gulong frequency;
 
16
         User *user;
 
17
+        struct passwd *pw;
 
18
 
 
19
         frequency = 0;
 
20
         username = NULL;
 
21
@@ -344,7 +345,9 @@ process_ck_history_line (Daemon      *daemon,
 
22
                 return;
 
23
         }
 
24
 
 
25
-        if (user_is_excluded (daemon, username, daemon->priv->minimal_uid)) {
 
26
+        pw = getpwnam (username);
 
27
+
 
28
+        if (user_is_excluded (daemon, username, pw->pw_uid)) {
 
29
                 g_debug ("excluding user '%s'", username);
 
30
                 g_free (username);
 
31
                 return;
 
32
-- 
 
33
1.7.4.1
 
34