Fixed bug related to primary group deletion

diff --git a/dists/debian/changelog b/dists/debian/changelog
index 37fba42..a1dcb92 100644 (file)
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -1,3 +1,10 @@
+gumd (0.0.5-2) unstable; urgency=low
+
+  * Fixed bug related to primary group deletion, as it needs not to be deleted
+    if other users have that group as primary group.
+
+ -- Imran Zaman <imran.zaman@intel.com>  Mon, 21 Sep  2014 13:00:00 +0300
+
 gumd (0.0.5-1) unstable; urgency=low
 
   * Add support for overriding the bus type using environment variable

diff --git a/dists/rpm/gum-suse.spec b/dists/rpm/gum-suse.spec
index 2edf4eb..1672c5d 100644 (file)
--- a/dists/rpm/gum-suse.spec
+++ b/dists/rpm/gum-suse.spec
@@ -8,7 +8,7 @@
 Name: gumd
 Summary: User management daemon and client library
 Version: 0.0.5
-Release: 1
+Release: 2
 Group: System/Daemons
 License: LGPL-2.1+
 Source: %{name}-%{version}.tar.gz
@@ -135,6 +135,10 @@ mkdir -p %{_sysconfdir}/%{name}/groupdel.d
 
 
 %changelog
+* Mon Sep 21 2014 Imran Zaman <imran.zaman@intel.com>
+- Fixed bug related to primary group deletion, as it needs not to be deleted
+  if other users have that group as primary group.
+
 * Fri Sep 19 2014 Imran Zaman <imran.zaman@intel.com>
 - Add support for overriding the bus type using environment variable
 

diff --git a/dists/rpm/tizen/packaging/gumd.changes b/dists/rpm/tizen/packaging/gumd.changes
index 6eee629..8bd1da7 100644 (file)
--- a/dists/rpm/tizen/packaging/gumd.changes
+++ b/dists/rpm/tizen/packaging/gumd.changes
@@ -1,3 +1,7 @@
+* Mon Sep 21 2014 Imran Zaman <imran.zaman@intel.com>
+- Fixed bug related to primary group deletion, as it needs not to be deleted
+  if other users have that group as primary group.
+
 * Fri Sep 19 2014 Imran Zaman <imran.zaman@intel.com>
 - Add support for overriding the bus type using environment variable
 

diff --git a/dists/rpm/tizen/packaging/gumd.spec b/dists/rpm/tizen/packaging/gumd.spec
index 6e2b2dd..c263c1b 100644 (file)
--- a/dists/rpm/tizen/packaging/gumd.spec
+++ b/dists/rpm/tizen/packaging/gumd.spec
@@ -7,7 +7,7 @@
 Name: gumd
 Summary: User management daemon and client library
 Version: 0.0.5
-Release: 1
+Release: 2
 Group: Security/Accounts
 License: LGPL-2.1+
 Source: %{name}-%{version}.tar.gz

diff --git a/src/daemon/gumd-daemon-group.c b/src/daemon/gumd-daemon-group.c
index da4e23d..ffbf983 100644 (file)
--- a/src/daemon/gumd-daemon-group.c
+++ b/src/daemon/gumd-daemon-group.c
@@ -921,8 +921,9 @@ gumd_daemon_group_delete (
             gum_config_get_string (self->priv->config,
                     GUM_CONFIG_GENERAL_PASSWD_FILE)) != NULL) {
         gum_lock_pwdf_unlock ();
-        GUM_RETURN_WITH_ERROR (GUM_ERROR_GROUP_HAS_USER,
-                "Group is a primary group of an existing user", error, FALSE);
+        WARN ("Not deleting the group as it is a primary group another"
+                " existing user");
+        return TRUE;
     }
 
     const gchar *scrip_dir = GROUPDEL_SCRIPT_DIR;

diff --git a/src/daemon/gumd-daemon-user.c b/src/daemon/gumd-daemon-user.c
index d787ed3..4b6cd76 100644 (file)
--- a/src/daemon/gumd-daemon-user.c
+++ b/src/daemon/gumd-daemon-user.c
@@ -1206,11 +1206,8 @@ _delete_group (
                         error, FALSE);
     }
 
-    g_object_set (G_OBJECT(group), "groupname", self->priv->pw->pw_name,
-            "gid", self->priv->pw->pw_gid, NULL);
+    g_object_set (G_OBJECT(group), "gid", self->priv->pw->pw_gid, NULL);
     if (!(deleted = gumd_daemon_group_delete (group, error))) {
-        GUM_SET_ERROR (GUM_ERROR_USER_GROUP_DELETE_FAILURE,
-                        "Group delete failure", error, deleted, FALSE);
         goto _finished;
     }