From 681742138b2afbbefa7f14de937beb438409208e Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Tue, 8 Jan 2013 00:59:32 -0500
Subject: Add domain arguments to sysdb services functions

also fix sysdb_svc_add declarations
---
 src/providers/ldap/ldap_id_services.c | 4 ++--
 src/providers/ldap/sdap_reinit.c      | 5 +++--
 src/providers/proxy/proxy_services.c  | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/providers')

diff --git a/src/providers/ldap/ldap_id_services.c b/src/providers/ldap/ldap_id_services.c
index b02913514..1a2a7b6bc 100644
--- a/src/providers/ldap/ldap_id_services.c
+++ b/src/providers/ldap/ldap_id_services.c
@@ -243,7 +243,7 @@ services_get_done(struct tevent_req *subreq)
         /* Ensure that this entry is removed from the sysdb */
         switch(state->filter_type) {
         case BE_FILTER_NAME:
-            ret = sysdb_svc_delete(state->sysdb, state->name,
+            ret = sysdb_svc_delete(state->sysdb, state->domain, state->name,
                                    0, state->protocol);
             if (ret != EOK) {
                 tevent_req_error(req, ret);
@@ -258,7 +258,7 @@ services_get_done(struct tevent_req *subreq)
                 return;
             }
 
-            ret = sysdb_svc_delete(state->sysdb, NULL,
+            ret = sysdb_svc_delete(state->sysdb, state->domain, NULL,
                                    port, state->protocol);
             if (ret != EOK) {
                 tevent_req_error(req, ret);
diff --git a/src/providers/ldap/sdap_reinit.c b/src/providers/ldap/sdap_reinit.c
index dd49c7b89..3fba9360b 100644
--- a/src/providers/ldap/sdap_reinit.c
+++ b/src/providers/ldap/sdap_reinit.c
@@ -163,7 +163,8 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb,
     msgs_num = 0;
 
     /* reset services' usn */
-    ret = sysdb_search_services(tmp_ctx, sysdb, "", attrs, &msgs_num, &msgs);
+    ret = sysdb_search_services(tmp_ctx, sysdb, domain,
+                                "", attrs, &msgs_num, &msgs);
     sdap_delete_msgs_usn(sysdb, msgs, msgs_num);
     talloc_zfree(msgs);
     msgs_num = 0;
@@ -290,7 +291,7 @@ static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb,
     msgs_num = 0;
 
     /* purge untouched services */
-    ret = sysdb_search_services(tmp_ctx, sysdb, "(!("SYSDB_USN"=*))",
+    ret = sysdb_search_services(tmp_ctx, sysdb, domain, "(!("SYSDB_USN"=*))",
                                 attrs, &msgs_num, &msgs);
     sdap_delete_msgs_dn(sysdb, msgs, msgs_num);
     talloc_zfree(msgs);
diff --git a/src/providers/proxy/proxy_services.c b/src/providers/proxy/proxy_services.c
index 3b79f81b0..e9f3b3f5c 100644
--- a/src/providers/proxy/proxy_services.c
+++ b/src/providers/proxy/proxy_services.c
@@ -117,7 +117,7 @@ get_serv_byname(struct proxy_id_ctx *ctx,
 
     if (status == NSS_STATUS_NOTFOUND) {
         /* Make sure we remove it from the cache */
-        ret = sysdb_svc_delete(sysdb, name, 0, protocol);
+        ret = sysdb_svc_delete(sysdb, dom, name, 0, protocol);
     } else {
 
         /* Results found. Save them into the cache */
@@ -171,7 +171,7 @@ get_serv_byport(struct proxy_id_ctx *ctx,
 
     if (status == NSS_STATUS_NOTFOUND) {
         /* Make sure we remove it from the cache */
-        ret = sysdb_svc_delete(sysdb, NULL, port, protocol);
+        ret = sysdb_svc_delete(sysdb, dom, NULL, port, protocol);
     } else {
         /* Results found. Save them into the cache */
         ret = proxy_save_service(sysdb, dom, result,
-- 
cgit