diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2002-08-17 14:45:04 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2002-08-17 14:45:04 +0000 |
| commit | f0255b38bc17f4da9a63b2be4c3ce505688e933e (patch) | |
| tree | 02704f36832ac0c59a0d70c32203abcbdf18fec6 /source3/utils/testparm.c | |
| parent | fcbb06414d2c8385ce4e68f23905a528c8fbd4e8 (diff) | |
| download | samba-f0255b38bc17f4da9a63b2be4c3ce505688e933e.tar.gz samba-f0255b38bc17f4da9a63b2be4c3ce505688e933e.tar.bz2 samba-f0255b38bc17f4da9a63b2be4c3ce505688e933e.zip | |
sync 3.0 branch with HEAD
(This used to be commit 1b83b78e332b9d28914eff155530e81cf2073a58)
Diffstat (limited to 'source3/utils/testparm.c')
| -rw-r--r-- | source3/utils/testparm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index 1d48249a75..3086019467 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -175,7 +175,6 @@ int main(int argc, char *argv[]) { extern char *optarg; extern int optind; - extern fstring local_machine; const char *config_file = dyn_CONFIGFILE; int s; static BOOL silent_mode = False; @@ -183,7 +182,7 @@ int main(int argc, char *argv[]) int opt; poptContext pc; static char *term_code = ""; - static char *new_local_machine = local_machine; + static char *new_local_machine = NULL; const char *cname; const char *caddr; @@ -207,8 +206,10 @@ int main(int argc, char *argv[]) cname = poptGetArg(pc); caddr = poptGetArg(pc); - - fstrcpy(local_machine,new_local_machine); + + if (new_local_machine) { + set_local_machine_name(new_local_machine); + } dbf = x_stdout; DEBUGLEVEL = 2; |