[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-84-g204660a

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  204660a7e0f3956a5d8b7375a2a9ab29e1dcf8b4 (commit)
      from  304cc4f599857aa5f20247d33a47131bba6605bd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit 204660a7e0f3956a5d8b7375a2a9ab29e1dcf8b4
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 7 18:18:35 2008 +0100

    Enable libnetjoin debugging for now but avoid printing passwords.
    
    The gen_ndr needs proper fixing still.
    
    Guenther
    (cherry picked from commit 966d7244d7765d285a7026b97e6093fd1f8d83ce)

-----------------------------------------------------------------------

Summary of changes:
 source/lib/netapi/joindomain.c          |    1 +
 source/librpc/gen_ndr/ndr_libnet_join.c |   10 ++++++++++
 source/utils/net_ads.c                  |    4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/joindomain.c b/source/lib/netapi/joindomain.c
index 405f96a..9c0e8aa 100644
--- a/source/lib/netapi/joindomain.c
+++ b/source/lib/netapi/joindomain.c
@@ -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) {
diff --git a/source/librpc/gen_ndr/ndr_libnet_join.c b/source/librpc/gen_ndr/ndr_libnet_join.c
index 6e65d03..2cb1adb 100644
--- a/source/librpc/gen_ndr/ndr_libnet_join.c
+++ b/source/librpc/gen_ndr/ndr_libnet_join.c
@@ -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);
@@ -73,8 +78,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);
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 9358a4f..44a2257 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -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;


-- 
Samba Shared Repository