summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-03-27 20:25:34 +0000
committerJeremy Allison <jra@samba.org>2000-03-27 20:25:34 +0000
commit0583c25087c2e1dcb42e0e7f9f38ffc6f9103b15 (patch)
tree07eba84a788f9c4b1c26aaf223033a6e3f535a5d
parent18bc76a0c6830358a137b4198e17b1b7ce92b9bf (diff)
downloadsamba-0583c25087c2e1dcb42e0e7f9f38ffc6f9103b15.tar.gz
samba-0583c25087c2e1dcb42e0e7f9f38ffc6f9103b15.tar.bz2
samba-0583c25087c2e1dcb42e0e7f9f38ffc6f9103b15.zip
Fixed crash bug in new handle_netbios_name code.
Jeremy. (This used to be commit 26963f2f8ec923991efecf6ac177fb17e7a924b0)
-rw-r--r--source3/param/loadparm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 4f6178a569..ab96d85494 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -573,7 +573,7 @@ static struct parm_struct parm_table[] =
{"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_BASIC|FLAG_SHARE|FLAG_PRINT|FLAG_DOS_STRING},
{"directory", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_DOS_STRING},
{"workgroup", P_USTRING, P_GLOBAL, &Globals.szWorkGroup, NULL, NULL, FLAG_BASIC|FLAG_DOS_STRING},
- {"netbios name", P_UGSTRING,P_GLOBAL, global_myname, handle_netbios_name, NULL, FLAG_BASIC|FLAG_DOS_STRING},
+ {"netbios name", P_UGSTRING,P_GLOBAL, NULL, handle_netbios_name, NULL, FLAG_BASIC|FLAG_DOS_STRING},
{"netbios aliases", P_STRING, P_GLOBAL, &Globals.szNetbiosAliases, NULL, NULL, FLAG_DOS_STRING},
{"netbios scope", P_UGSTRING,P_GLOBAL, global_scope, NULL, NULL, FLAG_DOS_STRING},
{"server string", P_STRING, P_GLOBAL, &Globals.szServerString, NULL, NULL, FLAG_BASIC|FLAG_DOS_STRING},
@@ -1934,6 +1934,7 @@ BOOL lp_file_list_changed(void)
/***************************************************************************
Run standard_sub_basic on netbios name... needed because global_myname
is not accessed through any lp_ macro.
+ Note: We must *NOT* use string_set() here as ptr points to global_myname.
***************************************************************************/
static BOOL handle_netbios_name(char *pszParmValue,char **ptr)
@@ -1944,7 +1945,6 @@ static BOOL handle_netbios_name(char *pszParmValue,char **ptr)
standard_sub_basic(netbios_name);
strupper(netbios_name);
- string_set(ptr,netbios_name);
/*
* Convert from UNIX to DOS string - the UNIX to DOS converter