Merge branch 'master' of ssh://git.samba.org/data/git/samba

1 files changed, 12 insertions, 10 deletions

diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 9fc02bac13..6c69300e85 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -272,7 +272,7 @@ static bool print_tree(struct user_auth_info *user_info)
  int main(int argc,char *argv[])
 {
 	TALLOC_CTX *frame = talloc_stackframe();
-	struct user_auth_info local_auth_info;
+	struct user_auth_info *auth_info;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
 		{ "broadcast", 'b', POPT_ARG_VAL, &use_bcast, True, "Use broadcast instead of using the master browser" },
@@ -293,6 +293,12 @@ static bool print_tree(struct user_auth_info *user_info)
 
 	setup_logging(argv[0],True);
 
+	auth_info = user_auth_info_init(frame);
+	if (auth_info == NULL) {
+		exit(1);
+	}
+	popt_common_set_auth_info(auth_info);
+
 	pc = poptGetContext("smbtree", argc, (const char **)argv, long_options,
 						POPT_CONTEXT_KEEP_FIRST);
 	while(poptGetNextOpt(pc) != -1);
@@ -303,26 +309,22 @@ static bool print_tree(struct user_auth_info *user_info)
 
 	/* Parse command line args */
 
-	if (get_cmdline_auth_info_use_machine_account() &&
-	    !set_cmdline_auth_info_machine_account_creds()) {
+	if (get_cmdline_auth_info_use_machine_account(auth_info) &&
+	    !set_cmdline_auth_info_machine_account_creds(auth_info)) {
 		TALLOC_FREE(frame);
 		return 1;
 	}
 
-	if (!get_cmdline_auth_info_got_pass()) {
+	if (!get_cmdline_auth_info_got_pass(auth_info)) {
 		char *pass = getpass("Password: ");
 		if (pass) {
-			set_cmdline_auth_info_password(pass);
+			set_cmdline_auth_info_password(auth_info, pass);
 		}
 	}
 
 	/* Now do our stuff */
 
-	if (!get_cmdline_auth_info_copy(&local_auth_info)) {
-		return 1;
-	}
-
-        if (!print_tree(&local_auth_info)) {
+        if (!print_tree(auth_info)) {
 		TALLOC_FREE(frame);
                 return 1;
 	}