Rename server_name to dc_name in libnet join structures.

Guenther
(This used to be commit ff5e15b1ba0d5c39ceef9f9995c107e510162564)

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 921f816cbe333b667abd52c04c6d0b864727851a..0d4452e1dfc26c9b1dfb5c2bcf41155cc96303a6 100644 (file)
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -54,8 +54,9 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
                if (!NT_STATUS_IS_OK(status)) {
                        return ntstatus_to_werror(status);
                }
-               r->in.server_name = talloc_strdup(mem_ctx, info->domain_controller_name);
-               W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+               r->in.dc_name = talloc_strdup(mem_ctx,
+                                             info->domain_controller_name);
+               W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
        }
 
        if (account_ou) {
@@ -224,8 +225,8 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
        W_ERROR_NOT_OK_RETURN(werr);
 
        if (server_name) {
-               r->in.server_name = talloc_strdup(mem_ctx, server_name);
-               W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+               r->in.dc_name = talloc_strdup(mem_ctx, server_name);
+               W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
        } else {
 
                NTSTATUS status;
@@ -244,8 +245,9 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
                if (!NT_STATUS_IS_OK(status)) {
                        return ntstatus_to_werror(status);
                }
-               r->in.server_name = talloc_strdup(mem_ctx, info->domain_controller_name);
-               W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
+               r->in.dc_name = talloc_strdup(mem_ctx,
+                                             info->domain_controller_name);
+               W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
        }
 
        if (account) {

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index bd52ab70641641c8c959754aba6c165dac63ba83..95b643ffa6805b873cc2d26e4a59c81a70775354 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -69,7 +69,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
                NT_STATUS_HAVE_NO_MEMORY(r->in.machine_password);
        }
 
-       status = cli_full_connection(&cli, NULL, r->in.server_name,
+       status = cli_full_connection(&cli, NULL,
+                                    r->in.dc_name,
                                     NULL, 0,
                                     "IPC$", "IPC",
                                     r->in.admin_account,
@@ -253,7 +254,8 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
        SAM_USERINFO_CTR ctr, *qctr = NULL;
        SAM_USER_INFO_16 p16;
 
-       status = cli_full_connection(&cli, NULL, r->in.server_name,
+       status = cli_full_connection(&cli, NULL,
+                                    r->in.dc_name,
                                     NULL, 0,
                                     "IPC$", "IPC",
                                     r->in.admin_account,

diff --git a/source3/libnet/libnet_join.h b/source3/libnet/libnet_join.h
index 85c756f77b1d6d34d8a1368bac83076a516c82ee..9e7b8a9813bf022c9cabb0dd18f34b760b5e7f26 100644 (file)
--- a/source3/libnet/libnet_join.h
+++ b/source3/libnet/libnet_join.h
@@ -22,7 +22,8 @@
 
 struct libnet_JoinCtx {
        struct {
-               const char *server_name;
+               const char *dc_name;
+               const char *machine_name;
                const char *domain_name;
                const char *account_ou;
                const char *admin_account;
@@ -48,7 +49,7 @@ struct libnet_JoinCtx {
 
 struct libnet_UnjoinCtx {
        struct {
-               const char *server_name;
+               const char *dc_name;
                const char *domain_name;
                const char *admin_account;
                const char *admin_password;