From de526c8425886ca3bed8f07a0f092ba5ac325654 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Sun, 6 Jan 2013 01:39:03 -0500
Subject: Make sysdb_custom_dn() require a domain.

---
 src/db/sysdb.c        | 3 ++-
 src/db/sysdb.h        | 1 +
 src/db/sysdb_autofs.c | 3 ++-
 src/db/sysdb_ops.c    | 9 ++++++---
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/db')

diff --git a/src/db/sysdb.c b/src/db/sysdb.c
index 895125292..2f58d70d7 100644
--- a/src/db/sysdb.c
+++ b/src/db/sysdb.c
@@ -120,6 +120,7 @@ struct ldb_dn *sysdb_custom_subtree_dn(struct sysdb_ctx *sysdb,
 }
 
 struct ldb_dn *sysdb_custom_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
+                               struct sss_domain_info *dom,
                                const char *object_name,
                                const char *subtree_name)
 {
@@ -145,7 +146,7 @@ struct ldb_dn *sysdb_custom_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
     }
 
     dn = ldb_dn_new_fmt(mem_ctx, sysdb->ldb, SYSDB_TMPL_CUSTOM, clean_name,
-                        clean_subtree, sysdb->domain->name);
+                        clean_subtree, dom->name);
 
 done:
     talloc_free(tmp_ctx);
diff --git a/src/db/sysdb.h b/src/db/sysdb.h
index 3a5e36dac..fd1d7c819 100644
--- a/src/db/sysdb.h
+++ b/src/db/sysdb.h
@@ -337,6 +337,7 @@ struct ldb_dn *sysdb_domain_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
                                struct sss_domain_info *dom);
 struct ldb_dn *sysdb_base_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx);
 struct ldb_dn *sysdb_custom_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
+                               struct sss_domain_info *dom,
                                const char *object_name,
                                const char *subtree_name);
 struct ldb_dn *sysdb_custom_subtree_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
diff --git a/src/db/sysdb_autofs.c b/src/db/sysdb_autofs.c
index 57380cfdc..446b3cacf 100644
--- a/src/db/sysdb_autofs.c
+++ b/src/db/sysdb_autofs.c
@@ -31,7 +31,8 @@ sysdb_autofsmap_dn(TALLOC_CTX *mem_ctx,
                    struct sysdb_ctx *sysdb,
                    const char *map_name)
 {
-    return sysdb_custom_dn(sysdb, mem_ctx, map_name, AUTOFS_MAP_SUBDIR);
+    return sysdb_custom_dn(sysdb, mem_ctx,
+                           sysdb->domain, map_name, AUTOFS_MAP_SUBDIR);
 }
 
 static struct ldb_dn *
diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c
index 4b0e16767..b70e0966b 100644
--- a/src/db/sysdb_ops.c
+++ b/src/db/sysdb_ops.c
@@ -2037,7 +2037,8 @@ int sysdb_search_custom_by_name(TALLOC_CTX *mem_ctx,
         return ENOMEM;
     }
 
-    basedn = sysdb_custom_dn(sysdb, tmp_ctx, object_name, subtree_name);
+    basedn = sysdb_custom_dn(sysdb, tmp_ctx,
+                             sysdb->domain, object_name, subtree_name);
     if (basedn == NULL) {
         DEBUG(1, ("sysdb_custom_dn failed.\n"));
         ret = ENOMEM;
@@ -2119,7 +2120,8 @@ int sysdb_store_custom(struct sysdb_ctx *sysdb,
         goto done;
     }
 
-    msg->dn = sysdb_custom_dn(sysdb, tmp_ctx, object_name, subtree_name);
+    msg->dn = sysdb_custom_dn(sysdb, tmp_ctx,
+                              sysdb->domain, object_name, subtree_name);
     if (!msg->dn) {
         DEBUG(1, ("sysdb_custom_dn failed.\n"));
         ret = ENOMEM;
@@ -2189,7 +2191,8 @@ int sysdb_delete_custom(struct sysdb_ctx *sysdb,
         return ENOMEM;
     }
 
-    dn = sysdb_custom_dn(sysdb, tmp_ctx, object_name, subtree_name);
+    dn = sysdb_custom_dn(sysdb, tmp_ctx,
+                         sysdb->domain, object_name, subtree_name);
     if (dn == NULL) {
         DEBUG(1, ("sysdb_custom_dn failed.\n"));
         ret = ENOMEM;
-- 
cgit