diff options
| author | Tim Potter <tpot@samba.org> | 2002-11-29 02:58:59 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-11-29 02:58:59 +0000 |
| commit | f3e3a56ea9085b186af24b0b4e911863fd9ceacc (patch) | |
| tree | 994a10565d8ce8ff296fe3153433090e7570b271 /source3/utils | |
| parent | 8986bdf7072a9d9f100767a4546c70cdf69a72b2 (diff) | |
| download | samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.tar.gz samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.tar.bz2 samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.zip | |
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)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 7 | ||||
| -rw-r--r-- | source3/utils/smbcontrol.c | 2 | ||||
| -rw-r--r-- | source3/utils/smbfilter.c | 1 | ||||
| -rw-r--r-- | source3/utils/testparm.c | 1 | ||||
| -rw-r--r-- | source3/utils/testprns.c | 1 |
5 files changed, 5 insertions, 7 deletions
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 */ diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 2f3bb2e0da..933cabdb4b 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -470,7 +470,7 @@ static BOOL do_command(char *dest, char *msg_name, int iparams, char **params) JOB_STATUS_DELETED, SPOOLSS_NOTIFY_MSG_UNIX_JOBID); } - + /* printer change notify */ if (strequal(cmd, "printer")) { diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c index 5a2d394706..1a0d639f02 100644 --- a/source3/utils/smbfilter.c +++ b/source3/utils/smbfilter.c @@ -19,7 +19,6 @@ */ #include "includes.h" -#include "smb.h" #define SECURITY_MASK 0 #define SECURITY_SET 0 diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index d30bd916b2..95c4b2b265 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -33,7 +33,6 @@ */ #include "includes.h" -#include "smb.h" extern BOOL AllowDebugChange; diff --git a/source3/utils/testprns.c b/source3/utils/testprns.c index 66c8e9bfd6..1c13bb4ce3 100644 --- a/source3/utils/testprns.c +++ b/source3/utils/testprns.c @@ -31,7 +31,6 @@ */ #include "includes.h" -#include "smb.h" int main(int argc, char *argv[]) { |