diff options
author | Gerald Carter <jerry@samba.org> | 2003-01-15 18:57:41 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2003-01-15 18:57:41 +0000 |
commit | 99cdb462083381c88689a4e698ca48b6ed4cf5ac (patch) | |
tree | 7ea530c74c8fd1ef65eec52410b7843e63d89f8f /source3/nmbd | |
parent | 35fa2e5975f9b380e6e63471413df6f4182c164b (diff) | |
download | samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.tar.gz samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.tar.bz2 samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.zip |
*lots of small merges form HEAD
*sync up configure.in
*don't build torture tools in make all
*make sure to remove torture tools as part of make clean
(This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef)
Diffstat (limited to 'source3/nmbd')
-rw-r--r-- | source3/nmbd/nmbd_become_lmb.c | 2 | ||||
-rw-r--r-- | source3/nmbd/nmbd_browsesync.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/nmbd/nmbd_become_lmb.c b/source3/nmbd/nmbd_become_lmb.c index 7b8ba14bb5..bac5589566 100644 --- a/source3/nmbd/nmbd_become_lmb.c +++ b/source3/nmbd/nmbd_become_lmb.c @@ -563,7 +563,7 @@ in workgroup %s on subnet %s\n", userdata->copy_fn = NULL; userdata->free_fn = NULL; userdata->userdata_len = strlen(work->work_group)+1; - pstrcpy(userdata->data, work->work_group); + fstrcpy(userdata->data, work->work_group); /* Register the special browser group name. */ register_name(subrec, MSBROWSE, 0x01, samba_nb_type|NB_GROUP, diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c index daa5142b25..f27f42297f 100644 --- a/source3/nmbd/nmbd_browsesync.c +++ b/source3/nmbd/nmbd_browsesync.c @@ -333,7 +333,7 @@ static void find_domain_master_name_query_success(struct subnet_record *subrec, userdata->copy_fn = NULL; userdata->free_fn = NULL; userdata->userdata_len = strlen(work->work_group)+1; - pstrcpy(userdata->data, work->work_group); + fstrcpy(userdata->data, work->work_group); node_status( subrec, &nmbname, answer_ip, domain_master_node_status_success, |