From: Günther Deschner <gd@samba.org>
Date: Fri, 14 Dec 2007 16:37:24 +0000 (+0100)
Subject: Make sure we also support non-domain join.
X-Git-Tag: release-3-2-0pre2~128^2~57
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=c818f5505a124a6f0bb9274a1ba4a6147d2f17b3;p=gd%2Fsamba%2F.git

Make sure we also support non-domain join.

Guenther
---

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index ce5b1b7b107..dd3d2254d83 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -250,6 +250,16 @@ static WERROR do_modify_vals_config(TALLOC_CTX *mem_ctx,
 	WERROR werr;
 	bool is_ad = false;
 
+	if (!(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE)) {
+
+		werr = do_modify_val_config(key, "security", "user");
+		W_ERROR_NOT_OK_RETURN(werr);
+
+		werr = do_modify_val_config(key, "workgroup",
+					    r->in.domain_name);
+		return werr;
+	}
+
 	if (r->out.dns_domain_name) {
 		is_ad = true;
 	}
@@ -273,8 +283,8 @@ static WERROR do_modify_vals_config(TALLOC_CTX *mem_ctx,
 	return werr;
 }
 
-static WERROR do_DomainJoinConfig(TALLOC_CTX *mem_ctx,
-				  struct libnet_JoinCtx *r)
+static WERROR do_JoinConfig(TALLOC_CTX *mem_ctx,
+			    struct libnet_JoinCtx *r)
 {
 	WERROR werr;
 	struct registry_key *key = NULL;
@@ -342,13 +352,18 @@ WERROR libnet_Join(TALLOC_CTX *mem_ctx,
 		return WERR_NOT_SUPPORTED;
 	}
 
-	werr = do_DomainJoin(mem_ctx, r);
+	if (r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
 
+		werr = do_DomainJoin(mem_ctx, r);
+		if (!W_ERROR_IS_OK(werr)) {
+			return werr;
+		}
+	}
+
+	werr = do_JoinConfig(mem_ctx, r);
 	if (!W_ERROR_IS_OK(werr)) {
 		return werr;
 	}
 
-	werr = do_DomainJoinConfig(mem_ctx, r);
-
 	return werr;
 }