summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-01-04 17:11:14 +0100
committerGünther Deschner <gd@samba.org>2008-01-04 17:43:15 +0100
commit28ef4878d937405340cc1984ef674ad0b670ef0c (patch)
tree46f627bc57401befc7b02ca5a309bf496f964fd5 /source3/lib
parent6f84ea9cd78e72b324ab6fad654b9aa109364d82 (diff)
downloadsamba-28ef4878d937405340cc1984ef674ad0b670ef0c.tar.gz
samba-28ef4878d937405340cc1984ef674ad0b670ef0c.tar.bz2
samba-28ef4878d937405340cc1984ef674ad0b670ef0c.zip
Rename server_name to dc_name in libnet join structures.
Guenther (This used to be commit ff5e15b1ba0d5c39ceef9f9995c107e510162564)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/netapi/joindomain.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 921f816cbe..0d4452e1df 100644
--- 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) {