diff options
author | Günther Deschner <gd@samba.org> | 2008-01-04 17:11:14 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2008-01-04 17:43:15 +0100 |
commit | 28ef4878d937405340cc1984ef674ad0b670ef0c (patch) | |
tree | 46f627bc57401befc7b02ca5a309bf496f964fd5 /source3/libnet | |
parent | 6f84ea9cd78e72b324ab6fad654b9aa109364d82 (diff) | |
download | samba-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/libnet')
-rw-r--r-- | source3/libnet/libnet_join.c | 6 | ||||
-rw-r--r-- | source3/libnet/libnet_join.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index bd52ab7064..95b643ffa6 100644 --- 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 85c756f77b..9e7b8a9813 100644 --- 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; |