From 2ca23577d3a25aead24ba759a1f6f67ffc24decf Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Mon, 7 Jan 2013 23:59:17 -0500
Subject: Add domain argument to sysdb_remove_attrs()

---
 src/db/sysdb.h          |  1 +
 src/db/sysdb_ops.c      | 13 +++++++------
 src/db/sysdb_services.c |  3 ++-
 src/db/sysdb_services.h |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/db')

diff --git a/src/db/sysdb.h b/src/db/sysdb.h
index 96bbb8d2..6fc71e1c 100644
--- a/src/db/sysdb.h
+++ b/src/db/sysdb.h
@@ -814,6 +814,7 @@ errno_t sysdb_set_enumerated(struct sysdb_ctx *sysdb,
                              bool enumerated);
 
 errno_t sysdb_remove_attrs(struct sysdb_ctx *sysdb,
+                           struct sss_domain_info *domain,
                            const char *name,
                            enum sysdb_member_type type,
                            char **remove_attrs);
diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c
index 06e930e1..5e6f6fb0 100644
--- a/src/db/sysdb_ops.c
+++ b/src/db/sysdb_ops.c
@@ -1582,7 +1582,7 @@ int sysdb_add_netgroup(struct sysdb_ctx *sysdb,
     ret = sysdb_set_netgroup_attr(sysdb, domain, name, attrs, SYSDB_MOD_REP);
 
     if (missing) {
-        ret = sysdb_remove_attrs(sysdb, name,
+        ret = sysdb_remove_attrs(sysdb, domain, name,
                                  SYSDB_MEMBER_NETGROUP,
                                  missing);
         if (ret != EOK) {
@@ -1742,7 +1742,7 @@ int sysdb_store_user(struct sysdb_ctx *sysdb,
     if (ret != EOK) goto fail;
 
     if (remove_attrs) {
-        ret = sysdb_remove_attrs(sysdb, name,
+        ret = sysdb_remove_attrs(sysdb, domain, name,
                                     SYSDB_MEMBER_USER,
                                     remove_attrs);
         if (ret != EOK) {
@@ -3070,6 +3070,7 @@ done:
 }
 
 errno_t sysdb_remove_attrs(struct sysdb_ctx *sysdb,
+                           struct sss_domain_info *domain,
                            const char *name,
                            enum sysdb_member_type type,
                            char **remove_attrs)
@@ -3086,19 +3087,19 @@ errno_t sysdb_remove_attrs(struct sysdb_ctx *sysdb,
 
     switch(type) {
     case SYSDB_MEMBER_USER:
-        msg->dn = sysdb_user_dn(sysdb, msg, sysdb->domain, name);
+        msg->dn = sysdb_user_dn(sysdb, msg, domain, name);
         break;
 
     case SYSDB_MEMBER_GROUP:
-        msg->dn = sysdb_group_dn(sysdb, msg, sysdb->domain, name);
+        msg->dn = sysdb_group_dn(sysdb, msg, domain, name);
         break;
 
     case SYSDB_MEMBER_NETGROUP:
-        msg->dn = sysdb_netgroup_dn(sysdb, msg, sysdb->domain, name);
+        msg->dn = sysdb_netgroup_dn(sysdb, msg, domain, name);
         break;
 
     case SYSDB_MEMBER_SERVICE:
-        msg->dn = sysdb_svc_dn(sysdb, msg, sysdb->domain->name, name);
+        msg->dn = sysdb_svc_dn(sysdb, msg, domain->name, name);
         break;
     }
     if (!msg->dn) {
diff --git a/src/db/sysdb_services.c b/src/db/sysdb_services.c
index 368cdeb6..2ac8d9a4 100644
--- a/src/db/sysdb_services.c
+++ b/src/db/sysdb_services.c
@@ -170,6 +170,7 @@ done:
 
 errno_t
 sysdb_store_service(struct sysdb_ctx *sysdb,
+                    struct sss_domain_info *domain,
                     const char *primary_name,
                     int port,
                     const char **aliases,
@@ -385,7 +386,7 @@ sysdb_store_service(struct sysdb_ctx *sysdb,
     if (ret != EOK) goto done;
 
     if (remove_attrs) {
-        ret = sysdb_remove_attrs(sysdb, primary_name,
+        ret = sysdb_remove_attrs(sysdb, domain, primary_name,
                                  SYSDB_MEMBER_SERVICE,
                                  remove_attrs);
         if (ret != EOK) {
diff --git a/src/db/sysdb_services.h b/src/db/sysdb_services.h
index 76ceb3cc..467a6584 100644
--- a/src/db/sysdb_services.h
+++ b/src/db/sysdb_services.h
@@ -66,6 +66,7 @@ sysdb_enumservent(TALLOC_CTX *mem_ctx,
 
 errno_t
 sysdb_store_service(struct sysdb_ctx *sysdb,
+                    struct sss_domain_info *domain,
                     const char *primary_name,
                     int port,
                     const char **aliases,
-- 
cgit