SYSDB: Drop the sysdb_ctx parameter from the sysdb_search module

9 files changed, 6 insertions, 13 deletions

diff --git a/src/tools/sss_groupdel.c b/src/tools/sss_groupdel.c
index 456b2b488..d13309d24 100644
--- a/src/tools/sss_groupdel.c
+++ b/src/tools/sss_groupdel.c
@@ -91,7 +91,7 @@ int main(int argc, const char **argv)
         goto fini;
     }
 
-    ret = sysdb_getgrnam_sync(tctx, tctx->sysdb, tctx->octx->name, tctx->octx);
+    ret = sysdb_getgrnam_sync(tctx, tctx->octx->name, tctx->octx);
     if (ret != EOK) {
         /* Error message will be printed in the switch */
         goto done;
diff --git a/src/tools/sss_groupmod.c b/src/tools/sss_groupmod.c
index 29113d3d6..10deea885 100644
--- a/src/tools/sss_groupmod.c
+++ b/src/tools/sss_groupmod.c
@@ -123,7 +123,7 @@ int main(int argc, const char **argv)
         goto fini;
     }
     /* check the username to be able to give sensible error message */
-    ret = sysdb_getgrnam_sync(tctx, tctx->sysdb, tctx->octx->name, tctx->octx);
+    ret = sysdb_getgrnam_sync(tctx, tctx->octx->name, tctx->octx);
     if (ret != EOK) {
         ERROR("Cannot find group in local domain, "
               "modifying groups is allowed only in local domain\n");
diff --git a/src/tools/sss_seed.c b/src/tools/sss_seed.c
index 78e027421..38a1bba8e 100644
--- a/src/tools/sss_seed.c
+++ b/src/tools/sss_seed.c
@@ -685,7 +685,7 @@ static int seed_domain_user_info(const char *name,
     }
 
     /* look for user in cache */
-    ret = sysdb_getpwnam(tmp_ctx, sysdb, domain, name, &res);
+    ret = sysdb_getpwnam(tmp_ctx, domain, name, &res);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
               ("Couldn't lookup user (%s) in the cache\n", name));
diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c
index 25c976345..8cae996a2 100644
--- a/src/tools/sss_sync_ops.c
+++ b/src/tools/sss_sync_ops.c
@@ -571,7 +571,6 @@ int groupdel(TALLOC_CTX *mem_ctx,
  * getpwnam, getgrnam and friends
  */
 int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx,
-                        struct sysdb_ctx *sysdb,
                         const char *name,
                         struct ops_ctx *out)
 {
@@ -579,7 +578,7 @@ int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx,
     const char *str;
     int ret;
 
-    ret = sysdb_getpwnam(mem_ctx, sysdb, out->domain, name, &res);
+    ret = sysdb_getpwnam(mem_ctx, out->domain, name, &res);
     if (ret) {
         return ret;
     }
@@ -644,7 +643,6 @@ int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx,
 }
 
 int sysdb_getgrnam_sync(TALLOC_CTX *mem_ctx,
-                        struct sysdb_ctx *sysdb,
                         const char *name,
                         struct ops_ctx *out)
 {
@@ -652,7 +650,7 @@ int sysdb_getgrnam_sync(TALLOC_CTX *mem_ctx,
     const char *str;
     int ret;
 
-    ret = sysdb_getgrnam(mem_ctx, sysdb, out->domain, name, &res);
+    ret = sysdb_getgrnam(mem_ctx, out->domain, name, &res);
     if (ret) {
         return ret;
     }
diff --git a/src/tools/sss_sync_ops.h b/src/tools/sss_sync_ops.h
index 95722a0b6..c1b787487 100644
--- a/src/tools/sss_sync_ops.h
+++ b/src/tools/sss_sync_ops.h
@@ -92,12 +92,10 @@ int groupmod(TALLOC_CTX *mem_ctx,
             struct ops_ctx *data);
 
 int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx,
-                        struct sysdb_ctx *sysdb,
                         const char *name,
                         struct ops_ctx *out);
 
 int sysdb_getgrnam_sync(TALLOC_CTX *mem_ctx,
-                        struct sysdb_ctx *sysdb,
                         const char *name,
                         struct ops_ctx *out);
 
diff --git a/src/tools/sss_useradd.c b/src/tools/sss_useradd.c
index ef594aed4..a1eef8d64 100644
--- a/src/tools/sss_useradd.c
+++ b/src/tools/sss_useradd.c
@@ -214,7 +214,6 @@ int main(int argc, const char **argv)
          * sysdb did assign it automatically, do a lookup */
         if (tctx->octx->uid == 0) {
             ret = sysdb_getpwnam_sync(tctx,
-                                      tctx->sysdb,
                                       tctx->octx->name,
                                       tctx->octx);
             if (ret != EOK) {
diff --git a/src/tools/sss_userdel.c b/src/tools/sss_userdel.c
index d61a45711..9d6c088c5 100644
--- a/src/tools/sss_userdel.c
+++ b/src/tools/sss_userdel.c
@@ -220,7 +220,6 @@ int main(int argc, const char **argv)
     }
 
     ret = sysdb_getpwnam_sync(tctx,
-                              tctx->sysdb,
                               tctx->octx->name,
                               tctx->octx);
     if (ret != EOK) {
diff --git a/src/tools/sss_usermod.c b/src/tools/sss_usermod.c
index fa2c27b04..09946e9ac 100644
--- a/src/tools/sss_usermod.c
+++ b/src/tools/sss_usermod.c
@@ -141,7 +141,7 @@ int main(int argc, const char **argv)
         goto fini;
     }
     /* check the username to be able to give sensible error message */
-    ret = sysdb_getpwnam_sync(tctx, tctx->sysdb, tctx->octx->name, tctx->octx);
+    ret = sysdb_getpwnam_sync(tctx, tctx->octx->name, tctx->octx);
     if (ret != EOK) {
         ERROR("Cannot find user in local domain, "
               "modifying users is allowed only in local domain\n");
diff --git a/src/tools/tools_util.c b/src/tools/tools_util.c
index 0e1b3b407..d31286dc4 100644
--- a/src/tools/tools_util.c
+++ b/src/tools/tools_util.c
@@ -223,7 +223,6 @@ int check_group_names(struct tools_ctx *tctx,
     ret = EOK;
     for (i=0; grouplist[i]; ++i) {
         ret = sysdb_getgrnam_sync(tctx,
-                                  tctx->sysdb,
                                   grouplist[i],
                                   groupinfo);
         if (ret) {