Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
static NTSTATUS libnet_join_connect_dc_ipc(const char *dc,
const char *user,
static NTSTATUS libnet_join_connect_dc_ipc(const char *dc,
const char *user,
const char *pass,
bool use_kerberos,
struct cli_state **cli)
const char *pass,
bool use_kerberos,
struct cli_state **cli)
NULL, 0,
"IPC$", "IPC",
user,
NULL, 0,
"IPC$", "IPC",
user,
pass,
flags,
SMB_SIGNING_DEFAULT);
pass,
flags,
SMB_SIGNING_DEFAULT);
status = libnet_join_connect_dc_ipc(r->in.dc_name,
r->in.admin_account,
status = libnet_join_connect_dc_ipc(r->in.dc_name,
r->in.admin_account,
r->in.admin_password,
r->in.use_kerberos,
cli);
r->in.admin_password,
r->in.use_kerberos,
cli);
status = libnet_join_connect_dc_ipc(r->in.dc_name,
r->in.admin_account,
status = libnet_join_connect_dc_ipc(r->in.dc_name,
r->in.admin_account,
r->in.admin_password,
r->in.use_kerberos,
&cli);
r->in.admin_password,
r->in.use_kerberos,
&cli);
return WERR_SETUP_DOMAIN_CONTROLLER;
}
return WERR_SETUP_DOMAIN_CONTROLLER;
}
+ if (!r->in.admin_domain) {
+ char *admin_domain = NULL;
+ char *admin_account = NULL;
+ split_domain_user(mem_ctx,
+ r->in.admin_account,
+ &admin_domain,
+ &admin_account);
+ r->in.admin_domain = admin_domain;
+ r->in.admin_account = admin_account;
+ }
+
if (!secrets_init()) {
libnet_join_set_error_string(mem_ctx, r,
"Unable to open secrets database");
if (!secrets_init()) {
libnet_join_set_error_string(mem_ctx, r,
"Unable to open secrets database");
return WERR_SETUP_DOMAIN_CONTROLLER;
}
return WERR_SETUP_DOMAIN_CONTROLLER;
}
+ if (!r->in.admin_domain) {
+ char *admin_domain = NULL;
+ char *admin_account = NULL;
+ split_domain_user(mem_ctx,
+ r->in.admin_account,
+ &admin_domain,
+ &admin_account);
+ r->in.admin_domain = admin_domain;
+ r->in.admin_account = admin_account;
+ }
+
if (!secrets_init()) {
libnet_unjoin_set_error_string(mem_ctx, r,
"Unable to open secrets database");
if (!secrets_init()) {
libnet_unjoin_set_error_string(mem_ctx, r,
"Unable to open secrets database");