diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
| commit | 27b7e51a3cc619f879655a3230611457ac43b9e7 (patch) | |
| tree | 7aeb0ed6623ea91092320f13bb12eb167c446809 /source3/smbd | |
| parent | d645041d6345ff2802dd2f06ebed1d8f456fee23 (diff) | |
| download | samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.gz samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.bz2 samba-27b7e51a3cc619f879655a3230611457ac43b9e7.zip | |
Merge from HEAD:
- fstring/pstring mixups
- the detection code that found them (disabled)
- a bit of whitespace
- a static
Andrew Bartlett
(This used to be commit 9b70fa868e7d9481f584c83fc4046174e1dedfd9)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/lanman.c | 2 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index b1dfa68fec..25f390be55 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -1008,7 +1008,7 @@ static int get_server_info(uint32 servertype, if (!next_token(&ptr,s->comment, NULL, sizeof(s->comment))) continue; if (!next_token(&ptr,s->domain , NULL, sizeof(s->domain))) { /* this allows us to cope with an old nmbd */ - pstrcpy(s->domain,lp_workgroup()); + fstrcpy(s->domain,lp_workgroup()); } if (sscanf(stype,"%X",&s->type) != 1) { diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index ef5a090243..580878fe32 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -669,7 +669,7 @@ int reply_search(connection_struct *conn, char *inbuf,char *outbuf, int dum_size if (!conn->dirptr) goto SearchEmpty; string_set(&conn->dirpath,dptr_path(dptr_num)); - fstrcpy(mask, dptr_wcard(dptr_num)); + pstrcpy(mask, dptr_wcard(dptr_num)); } if (can_open) { |