diff options
| author | Simo Sorce <simo@redhat.com> | 2013-01-06 01:25:00 -0500 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-01-15 10:49:20 +0100 |
| commit | 2ee09a30b020916ee7bf2f61f993ce7844897c1f (patch) | |
| tree | 4e64630f50f7cb98076814bcdd60ffabddc8c43a | |
| parent | 7c974e792beef952ceb19a01775c6d0ee71a1253 (diff) | |
| download | sssd-2ee09a30b020916ee7bf2f61f993ce7844897c1f.tar.gz sssd-2ee09a30b020916ee7bf2f61f993ce7844897c1f.tar.xz sssd-2ee09a30b020916ee7bf2f61f993ce7844897c1f.zip | |
Make sysdb_netgroup_base_dn() require a domain.
| -rw-r--r-- | src/db/sysdb.c | 8 | ||||
| -rw-r--r-- | src/db/sysdb.h | 4 | ||||
| -rw-r--r-- | src/providers/ldap/sdap_async_netgroups.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/db/sysdb.c b/src/db/sysdb.c index edfcef026..c79a63342 100644 --- a/src/db/sysdb.c +++ b/src/db/sysdb.c @@ -209,10 +209,12 @@ struct ldb_dn *sysdb_netgroup_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx, return dn; } -struct ldb_dn *sysdb_netgroup_base_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx) +struct ldb_dn *sysdb_netgroup_base_dn(struct sysdb_ctx *sysdb, + TALLOC_CTX *mem_ctx, + struct sss_domain_info *dom) { - return ldb_dn_new_fmt(mem_ctx, sysdb->ldb, SYSDB_TMPL_NETGROUP_BASE, - sysdb->domain->name); + return ldb_dn_new_fmt(mem_ctx, sysdb->ldb, + SYSDB_TMPL_NETGROUP_BASE, dom->name); } errno_t sysdb_get_rdn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx, diff --git a/src/db/sysdb.h b/src/db/sysdb.h index fd00fa35c..d558884b5 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -328,7 +328,9 @@ struct ldb_dn *sysdb_group_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx, struct sss_domain_info *dom, const char *name); struct ldb_dn *sysdb_netgroup_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx, struct sss_domain_info *dom, const char *name); -struct ldb_dn *sysdb_netgroup_base_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx); +struct ldb_dn *sysdb_netgroup_base_dn(struct sysdb_ctx *sysdb, + TALLOC_CTX *mem_ctx, + struct sss_domain_info *dom); errno_t sysdb_group_dn_name(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx, const char *dn_str, char **name); struct ldb_dn *sysdb_domain_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx); diff --git a/src/providers/ldap/sdap_async_netgroups.c b/src/providers/ldap/sdap_async_netgroups.c index 12715d491..57a9b9434 100644 --- a/src/providers/ldap/sdap_async_netgroups.c +++ b/src/providers/ldap/sdap_async_netgroups.c @@ -324,7 +324,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, goto fail; } - netgr_basedn = sysdb_netgroup_base_dn(sysdb, state); + netgr_basedn = sysdb_netgroup_base_dn(sysdb, state, dom); if (netgr_basedn == NULL) { ret = ENOMEM; goto fail; |