summaryrefslogtreecommitdiff
path: root/source3/libnet
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-07-30 21:38:21 +0200
committerGünther Deschner <gd@samba.org>2008-08-11 19:52:23 +0200
commit5bea31aa3c6a1e66496d6bb596b96977ba01457f (patch)
tree9ad2dfcdeba5153c547aeb1faddf029ff475127a /source3/libnet
parent051cb1a4de1f089f61a82eec6cc485da6d02efa3 (diff)
downloadsamba-5bea31aa3c6a1e66496d6bb596b96977ba01457f.tar.gz
samba-5bea31aa3c6a1e66496d6bb596b96977ba01457f.tar.bz2
samba-5bea31aa3c6a1e66496d6bb596b96977ba01457f.zip
libnetjoin: support kerberized joining/unjoing (fix #5416).
Guenther (This used to be commit da6e0f4f375aa533c4c765891c960070478972eb)
Diffstat (limited to 'source3/libnet')
-rw-r--r--source3/libnet/libnet_join.c60
1 files changed, 41 insertions, 19 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 2f2c71dfce..b7a15c558b 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -642,6 +642,37 @@ static bool libnet_join_joindomain_store_secrets(TALLOC_CTX *mem_ctx,
}
/****************************************************************
+ Connect dc's IPC$ share
+****************************************************************/
+
+static NTSTATUS libnet_join_connect_dc_ipc(const char *dc,
+ const char *user,
+ const char *pass,
+ bool use_kerberos,
+ struct cli_state **cli)
+{
+ int flags = 0;
+
+ if (use_kerberos) {
+ flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
+ }
+
+ if (use_kerberos && pass) {
+ flags |= CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS;
+ }
+
+ return cli_full_connection(cli, NULL,
+ dc,
+ NULL, 0,
+ "IPC$", "IPC",
+ user,
+ NULL,
+ pass,
+ flags,
+ Undefined, NULL);
+}
+
+/****************************************************************
Lookup domain dc's info
****************************************************************/
@@ -654,16 +685,11 @@ static NTSTATUS libnet_join_lookup_dc_rpc(TALLOC_CTX *mem_ctx,
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
union lsa_PolicyInformation *info = NULL;
- status = cli_full_connection(cli, NULL,
- r->in.dc_name,
- NULL, 0,
- "IPC$", "IPC",
- r->in.admin_account,
- NULL,
- r->in.admin_password,
- 0,
- Undefined, NULL);
-
+ status = libnet_join_connect_dc_ipc(r->in.dc_name,
+ r->in.admin_account,
+ r->in.admin_password,
+ r->in.use_kerberos,
+ cli);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}
@@ -1109,15 +1135,11 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
ZERO_STRUCT(domain_pol);
ZERO_STRUCT(user_pol);
- status = cli_full_connection(&cli, NULL,
- r->in.dc_name,
- NULL, 0,
- "IPC$", "IPC",
- r->in.admin_account,
- NULL,
- r->in.admin_password,
- 0, Undefined, NULL);
-
+ status = libnet_join_connect_dc_ipc(r->in.dc_name,
+ r->in.admin_account,
+ r->in.admin_password,
+ r->in.use_kerberos,
+ &cli);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}