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 f55d558c01dffe9cea4c65836230427137b646ce..90e1b5941e52c176397521663daa03ab95235196 100644 (file)
--- 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;