From e79d23932ef9d52cf4eb32ddec2d0a9b3af9a9eb Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@redhat.com>
Date: Fri, 20 May 2011 03:48:05 -0400
Subject: sysdb refactoring: memory context deleted

This patch deletes memory context parameter in those places in sysdb
where it is not necessary. The code using modified functions has been
updated. Tests updated as well.
---
 src/tools/sss_cache.c    |  8 ++++----
 src/tools/sss_sync_ops.c | 14 +++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/sss_cache.c b/src/tools/sss_cache.c
index 67fe2df5c..37b60c896 100644
--- a/src/tools/sss_cache.c
+++ b/src/tools/sss_cache.c
@@ -157,12 +157,12 @@ errno_t invalidate_entry(TALLOC_CTX *ctx, struct sysdb_ctx *sysdb,
         if (ret == EOK) {
             switch (entry_type) {
                 case TYPE_USER:
-                    ret = sysdb_set_user_attr(ctx, sysdb, name,
-                            sys_attrs, SYSDB_MOD_REP);
+                    ret = sysdb_set_user_attr(sysdb, name, sys_attrs,
+                                              SYSDB_MOD_REP);
                     break;
                 case TYPE_GROUP:
-                    ret = sysdb_set_group_attr(ctx, sysdb, name,
-                            sys_attrs, SYSDB_MOD_REP);
+                    ret = sysdb_set_group_attr(sysdb, name, sys_attrs,
+                                               SYSDB_MOD_REP);
                     break;
                 case TYPE_NETGROUP:
                     ret = sysdb_set_netgroup_attr(sysdb, name,
diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c
index d3cbb9d99..49c6c58e6 100644
--- a/src/tools/sss_sync_ops.c
+++ b/src/tools/sss_sync_ops.c
@@ -80,8 +80,7 @@ static int mod_groups_member(TALLOC_CTX *mem_ctx,
             goto done;
         }
 
-        ret = sysdb_mod_group_member(tmpctx, sysdb,
-                                     member_dn, parent_dn, optype);
+        ret = sysdb_mod_group_member(sysdb, member_dn, parent_dn, optype);
         if (ret) {
             goto done;
         }
@@ -223,8 +222,7 @@ int usermod(TALLOC_CTX *mem_ctx,
     }
 
     if (attrs->num != 0) {
-        ret = sysdb_set_user_attr(mem_ctx, sysdb, data->name,
-                                  attrs, SYSDB_MOD_REP);
+        ret = sysdb_set_user_attr(sysdb, data->name, attrs, SYSDB_MOD_REP);
         if (ret) {
             return ret;
         }
@@ -279,8 +277,7 @@ int groupmod(TALLOC_CTX *mem_ctx,
             return ret;
         }
 
-        ret = sysdb_set_group_attr(mem_ctx, sysdb, data->name,
-                                   attrs, SYSDB_MOD_REP);
+        ret = sysdb_set_group_attr(sysdb, data->name, attrs, SYSDB_MOD_REP);
         if (ret) {
             return ret;
         }
@@ -474,7 +471,7 @@ int useradd(TALLOC_CTX *mem_ctx,
 {
     int ret;
 
-    ret = sysdb_add_user(mem_ctx, sysdb, data->name, data->uid, data->gid,
+    ret = sysdb_add_user(sysdb, data->name, data->uid, data->gid,
                          data->gecos, data->home, data->shell, NULL, 0);
     if (ret) {
         goto done;
@@ -540,8 +537,7 @@ int groupadd(TALLOC_CTX *mem_ctx,
 {
     int ret;
 
-    ret = sysdb_add_group(mem_ctx, sysdb, data->name,
-                          data->gid, NULL, 0);
+    ret = sysdb_add_group(sysdb, data->name, data->gid, NULL, 0);
     if (ret == EOK) {
         flush_nscd_cache(mem_ctx, NSCD_DB_GROUP);
     }
-- 
cgit