From: Günther Deschner <gd@samba.org>
Date: Fri, 28 Mar 2008 15:39:02 +0000 (+0100)
Subject: Support "net ads join" format while joining to a specific ou.
X-Git-Tag: samba-3.3.0pre1~3019
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0be84c96d8133c6b77d1f0efe41f5f2373febb3;p=thirdparty%2Fsamba.git

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
---

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index f55d558c01d..90e1b5941e5 100644
--- a/source/libnet/libnet_join.c
+++ b/source/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;