1 files changed, 35 insertions, 0 deletions

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 0eb109c2cf..1530a9f6a8 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -1094,6 +1094,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
 	uint32_t acct_type = 0;
 	const char *account_name;
 	const char *netbios_name;
+	char *filter;
 	
 	r->out.error_string = NULL;
 
@@ -1212,6 +1213,13 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
 			talloc_free(tmp_mem);
 			return NT_STATUS_NO_MEMORY;
 		}
+
+		rtn = samdb_msg_add_string(ldb, tmp_mem, msg, "objectClass", "primaryDomain");
+		if (rtn == -1) {
+			r->out.error_string = NULL;
+			talloc_free(tmp_mem);
+			return NT_STATUS_NO_MEMORY;
+		}
 	}
 
 	rtn = samdb_msg_add_string(ldb, tmp_mem, msg, "objectClass", "primaryDomain");
@@ -1341,6 +1349,33 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 
+	if (r2->out.realm) {
+		struct cli_credentials *creds;
+		/* Make a credentials structure from it */
+		creds = cli_credentials_init(mem_ctx);
+		if (!creds) {
+			r->out.error_string = NULL;
+			talloc_free(tmp_mem);
+			return NT_STATUS_NO_MEMORY;
+		}
+		cli_credentials_set_conf(creds);
+		filter = talloc_asprintf(mem_ctx, "dn=%s", ldb_dn_linearize(mem_ctx, msg->dn));
+		status = cli_credentials_set_secrets(creds, NULL, filter);
+		if (!NT_STATUS_IS_OK(status)) {
+			r->out.error_string = talloc_asprintf(mem_ctx, "Failed to read secrets for keytab update for %s\n", 
+							      filter);
+			talloc_free(tmp_mem);
+			return status;
+		} 
+		ret = cli_credentials_update_keytab(creds);
+		if (ret != 0) {
+			r->out.error_string = talloc_asprintf(mem_ctx, "Failed to update keytab for %s\n", 
+							      filter);
+			talloc_free(tmp_mem);
+			return NT_STATUS_UNSUCCESSFUL;
+		}
+	}
+
 	/* move all out parameter to the callers TALLOC_CTX */
 	r->out.error_string	= NULL;
 	r->out.join_password	= r2->out.join_password;