diff options
| author | Jeremy Allison <jra@samba.org> | 2003-08-27 18:00:09 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-08-27 18:00:09 +0000 |
| commit | 8dc1a4f30066f7cc25ab6b775b24f32ba275d78e (patch) | |
| tree | ffddb657a9c0dd56e9153729f95d3d2941bcd2a4 /source3/nmbd/nmbd_workgroupdb.c | |
| parent | 4561b811df8b858fd7fbedeb534aa715d66a9005 (diff) | |
| download | samba-8dc1a4f30066f7cc25ab6b775b24f32ba275d78e.tar.gz samba-8dc1a4f30066f7cc25ab6b775b24f32ba275d78e.tar.bz2 samba-8dc1a4f30066f7cc25ab6b775b24f32ba275d78e.zip | |
Ensure we use correct length nstrings for workgroup and browser names.
Jeremy.
(This used to be commit be534c8adf6c3cb8921ce49dbb79991c632d501e)
Diffstat (limited to 'source3/nmbd/nmbd_workgroupdb.c')
| -rw-r--r-- | source3/nmbd/nmbd_workgroupdb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c index 08d6fb2c62..c957b517cf 100644 --- a/source3/nmbd/nmbd_workgroupdb.c +++ b/source3/nmbd/nmbd_workgroupdb.c @@ -56,7 +56,7 @@ static struct work_record *create_workgroup(const char *name, int ttl) } memset((char *)work, '\0', sizeof(*work)); - fstrcpy(work->work_group,name); + nstrcpy(work->work_group,name); work->serverlist = NULL; work->RunningElection = False; @@ -76,7 +76,7 @@ static struct work_record *create_workgroup(const char *name, int ttl) for (subrec = FIRST_SUBNET; subrec && (t == -1); subrec = NEXT_SUBNET_INCLUDING_UNICAST(subrec)) { struct work_record *w; for (w = subrec->workgrouplist; w && t == -1; w = w->next) { - if (strequal(w->work_group, work->work_group)) + if (strnequal(w->work_group, work->work_group, sizeof(nstring))) t = w->token; } } @@ -150,7 +150,7 @@ struct work_record *find_workgroup_on_subnet(struct subnet_record *subrec, name, subrec->subnet_name)); for (ret = subrec->workgrouplist; ret; ret = ret->next) { - if (strequal(ret->work_group,name)) { + if (strnequal(ret->work_group,name,sizeof(nstring))) { DEBUGADD(4, ("found.\n")); return(ret); } @@ -211,7 +211,7 @@ void initiate_myworkgroup_startup(struct subnet_record *subrec, struct work_reco { int i; - if(!strequal(lp_workgroup(), work->work_group)) + if(!strnequal(lp_workgroup(), work->work_group,sizeof(nstring))) return; /* If this is a broadcast subnet then start elections on it if we are so configured. */ |