summaryrefslogtreecommitdiff
path: root/source3/lib/netapi/joindomain.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-08-29 09:29:21 -0700
committerJeremy Allison <jra@samba.org>2008-08-29 09:29:21 -0700
commit8f525afbd2f2a849086c60ee890218a070cecd34 (patch)
treeb4398adfa7e57dacf7f7d9b29b4a14f6596d6fe0 /source3/lib/netapi/joindomain.c
parentb12c7dbb53023d1ea9e7df20137c0ad6ba21b9f0 (diff)
parentd2dc2e34be6f13956a91678bcb8dd098fb0e5c8b (diff)
downloadsamba-8f525afbd2f2a849086c60ee890218a070cecd34.tar.gz
samba-8f525afbd2f2a849086c60ee890218a070cecd34.tar.bz2
samba-8f525afbd2f2a849086c60ee890218a070cecd34.zip
Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
(This used to be commit 882297edc024c146f24fc9f847d2b0b813f93fc7)
Diffstat (limited to 'source3/lib/netapi/joindomain.c')
-rw-r--r--source3/lib/netapi/joindomain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 2a6fc80ca3..17ea3923fe 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -364,7 +364,7 @@ WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx,
dc = strip_hostname(info->dc_unc);
- ads = ads_init(r->in.domain, r->in.domain, dc);
+ ads = ads_init(info->domain_name, info->domain_name, dc);
if (!ads) {
return WERR_GENERAL_FAILURE;
}