sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-29 21:47:30 +03:00
Code

Enable libnetjoin debugging for now but avoid printing passwords.

Browse Source 
The gen_ndr needs proper fixing still.

Guenther
This commit is contained in:
Günther Deschner 2008-03-07 18:18:35 +01:00
parent c20c5f0821
commit 966d7244d7
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/lib/netapi/joindomain.c
View File

@ -81,6 +81,7 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
r->in.join_flags = join_flags;
r->in.modify_config = true;
r->in.debug = true;
werr = libnet_Join(mem_ctx, r);
if (!W_ERROR_IS_OK(werr) && r->out.error_string) {

10
source/librpc/gen_ndr/ndr_libnet_join.c
View File

@ -23,8 +23,13 @@ _PUBLIC_ void ndr_print_libnet_JoinCtx(struct ndr_print *ndr, const char *name,
ndr->depth--;
ndr_print_string(ndr, "account_ou", r->in.account_ou);
ndr_print_string(ndr, "admin_account", r->in.admin_account);
#ifdef DEBUG_PASSWORD
ndr_print_string(ndr, "admin_password", r->in.admin_password);
ndr_print_string(ndr, "machine_password", r->in.machine_password);
#else
ndr_print_ptr(ndr, "admin_password", r->in.admin_password);
ndr_print_ptr(ndr, "machine_password", r->in.machine_password);
#endif
ndr_print_wkssvc_joinflags(ndr, "join_flags", r->in.join_flags);
ndr_print_string(ndr, "os_version", r->in.os_version);
ndr_print_string(ndr, "os_name", r->in.os_name);
@ -74,8 +79,13 @@ _PUBLIC_ void ndr_print_libnet_UnjoinCtx(struct ndr_print *ndr, const char *name
ndr_print_string(ndr, "domain_name", r->in.domain_name);
ndr_print_string(ndr, "account_ou", r->in.account_ou);
ndr_print_string(ndr, "admin_account", r->in.admin_account);
#ifdef DEBUG_PASSWORD
ndr_print_string(ndr, "admin_password", r->in.admin_password);
ndr_print_string(ndr, "machine_password", r->in.machine_password);
#else
ndr_print_ptr(ndr, "admin_password", r->in.admin_password);
ndr_print_ptr(ndr, "machine_password", r->in.machine_password);
#endif
ndr_print_wkssvc_joinflags(ndr, "unjoin_flags", r->in.unjoin_flags);
ndr_print_uint8(ndr, "modify_config", r->in.modify_config);
ndr_print_ptr(ndr, "domain_sid", r->in.domain_sid);

4
source/utils/net_ads.c
View File

@ -829,7 +829,7 @@ static int net_ads_leave(int argc, const char **argv)
return -1;
}
r->in.debug = opt_verbose;
r->in.debug = true;
r->in.dc_name = opt_host;
r->in.domain_name = lp_realm();
r->in.admin_account = opt_user_name;
@ -1178,7 +1178,7 @@ int net_ads_join(int argc, const char **argv)
r->in.dc_name = opt_host;
r->in.admin_account = opt_user_name;
r->in.admin_password = net_prompt_pass(opt_user_name);
r->in.debug = opt_verbose;
r->in.debug = true;
r->in.join_flags = WKSSVC_JOIN_FLAGS_JOIN_TYPE |
WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE |
WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED;