From 3613cc1eba1337256a2d06ba7a84532156139ccd Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Sun, 6 Jan 2013 00:59:59 -0500
Subject: Make sysdb_user_dn() require a domain explictly.

---
 src/db/sysdb.c     |  4 ++--
 src/db/sysdb.h     |  2 +-
 src/db/sysdb_ops.c | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/db')

diff --git a/src/db/sysdb.c b/src/db/sysdb.c
index 479791b7..b7951d32 100644
--- a/src/db/sysdb.c
+++ b/src/db/sysdb.c
@@ -153,7 +153,7 @@ done:
 }
 
 struct ldb_dn *sysdb_user_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
-                             const char *name)
+                             struct sss_domain_info *dom, const char *name)
 {
     errno_t ret;
     char *clean_name;
@@ -165,7 +165,7 @@ struct ldb_dn *sysdb_user_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
     }
 
     dn = ldb_dn_new_fmt(mem_ctx, sysdb->ldb, SYSDB_TMPL_USER,
-                        clean_name, sysdb->domain->name);
+                        clean_name, dom->name);
     talloc_free(clean_name);
 
     return dn;
diff --git a/src/db/sysdb.h b/src/db/sysdb.h
index 9c2996ad..5130b06a 100644
--- a/src/db/sysdb.h
+++ b/src/db/sysdb.h
@@ -323,7 +323,7 @@ int sysdb_error_to_errno(int ldberr);
 errno_t sysdb_get_rdn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
                       const char *_dn, char **_name, char **_val);
 struct ldb_dn *sysdb_user_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
-                             const char *name);
+                             struct sss_domain_info *dom, const char *name);
 struct ldb_dn *sysdb_group_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
                               const char *name);
 struct ldb_dn *sysdb_netgroup_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c
index 9974beb0..108f3b84 100644
--- a/src/db/sysdb_ops.c
+++ b/src/db/sysdb_ops.c
@@ -249,7 +249,7 @@ int sysdb_search_user_by_name(TALLOC_CTX *mem_ctx,
         return ENOMEM;
     }
 
-    basedn = sysdb_user_dn(sysdb, tmp_ctx, name);
+    basedn = sysdb_user_dn(sysdb, tmp_ctx, sysdb->domain, name);
     if (!basedn) {
         ret = ENOMEM;
         goto done;
@@ -557,7 +557,7 @@ int sysdb_set_user_attr(struct sysdb_ctx *sysdb,
         return ENOMEM;
     }
 
-    dn = sysdb_user_dn(sysdb, tmp_ctx, name);
+    dn = sysdb_user_dn(sysdb, tmp_ctx, sysdb->domain, name);
     if (!dn) {
         ret = ENOMEM;
         goto done;
@@ -829,7 +829,7 @@ int sysdb_add_basic_user(struct sysdb_ctx *sysdb,
     }
 
     /* user dn */
-    msg->dn = sysdb_user_dn(sysdb, msg, name);
+    msg->dn = sysdb_user_dn(sysdb, msg, sysdb->domain, name);
     if (!msg->dn) {
         ERROR_OUT(ret, ENOMEM, done);
     }
@@ -1018,7 +1018,7 @@ sysdb_remove_ghostattr_from_groups(struct sysdb_ctx *sysdb,
         goto done;
     }
 
-    tmpdn = sysdb_user_dn(sysdb, tmp_ctx, name);
+    tmpdn = sysdb_user_dn(sysdb, tmp_ctx, sysdb->domain, name);
     if (!tmpdn) {
         ERROR_OUT(ret, ENOMEM, done);
     }
@@ -1874,7 +1874,7 @@ sysdb_group_membership_mod(struct sysdb_ctx *sysdb,
     }
 
     if (type == SYSDB_MEMBER_USER) {
-        member_dn = sysdb_user_dn(sysdb, tmp_ctx, member);
+        member_dn = sysdb_user_dn(sysdb, tmp_ctx, sysdb->domain, member);
     } else if (type == SYSDB_MEMBER_GROUP) {
         member_dn = sysdb_group_dn(sysdb, tmp_ctx, member);
     } else {
@@ -3045,7 +3045,7 @@ errno_t sysdb_remove_attrs(struct sysdb_ctx *sysdb,
 
     switch(type) {
     case SYSDB_MEMBER_USER:
-        msg->dn = sysdb_user_dn(sysdb, msg, name);
+        msg->dn = sysdb_user_dn(sysdb, msg, sysdb->domain, name);
         break;
 
     case SYSDB_MEMBER_GROUP:
-- 
cgit