From f3e3a56ea9085b186af24b0b4e911863fd9ceacc Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Fri, 29 Nov 2002 02:58:59 +0000 Subject: Merge a bunch of trivial changes from HEAD. The difference remaining should actual functional differences between HEAD and 3.0. - Mostly reformatting - Removal of unecessary #include "smb.h" - Merge of dyn_DRIVERFILE removal - Silly bug fix for python code (This used to be commit d3998307adc50ba50defe610cb656c73799ae3b9) --- source3/utils/net_rpc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source3/utils/net_rpc.c') diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index d5af6e3fb8..092d625ae5 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -1659,6 +1659,10 @@ static int rpc_trustdom_establish(int argc, const char **argv) domain_name = smb_xstrdup(argv[0]); strupper(domain_name); + + /* account name used at first is our domain's name with '$' */ + asprintf(&acct_name, "%s$", lp_workgroup()); + strupper(acct_name); /* * opt_workgroup will be used by connection functions further, @@ -1669,9 +1673,6 @@ static int rpc_trustdom_establish(int argc, const char **argv) opt_workgroup = smb_xstrdup(domain_name); }; - asprintf(&acct_name, "%s$", lp_workgroup()); - strupper(acct_name); - opt_user_name = acct_name; /* find the domain controller */ -- cgit