summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-03-28 16:39:02 +0100
committerGünther Deschner <gd@samba.org>2008-03-28 16:43:59 +0100
commit8b29c8f63454604b7d04cfcb171b30eb8e31636c (patch)
tree58840101295a925e7ad55b0e2c9534cb2cc7cea0 /source3
parent33a3766f033a25b0eb47a3537101d1141d26db3f (diff)
downloadsamba-8b29c8f63454604b7d04cfcb171b30eb8e31636c.tar.gz
samba-8b29c8f63454604b7d04cfcb171b30eb8e31636c.tar.bz2
samba-8b29c8f63454604b7d04cfcb171b30eb8e31636c.zip
Support "net ads join" format while joining to a specific ou.
libnetjoin now supports Computers/Servers/Unix as well as ou=Computers,ou=Servers,ou=Unix,dc=ber,dc=realm,dc=com. Guenther (This used to be commit c0be84c96d8133c6b77d1f0efe41f5f2373febb3)
Diffstat (limited to 'source3')
-rw-r--r--source3/libnet/libnet_join.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index f55d558c01..90e1b5941e 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -207,6 +207,11 @@ static ADS_STATUS libnet_join_precreate_machine_acct(TALLOC_CTX *mem_ctx,
const char *attrs[] = { "dn", NULL };
bool moved = false;
+ status = ads_check_ou_dn(mem_ctx, r->in.ads, r->in.account_ou);
+ if (!ADS_ERR_OK(status)) {
+ return status;
+ }
+
status = ads_search_dn(r->in.ads, &res, r->in.account_ou, attrs);
if (!ADS_ERR_OK(status)) {
return status;