diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-16 19:25:54 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-16 19:25:54 +0000 |
| commit | 2aa66b03bbe1acec9ee42e22fc20d2e0790ae84c (patch) | |
| tree | f9aa9ea42e4212f625dc2e7ff7b84b4062eaa57c /source/libsmb | |
| parent | 9daf4d9ba57e2a3d4bd023ddf8f9c0111fc1f873 (diff) | |
| download | samba-2aa66b03bbe1acec9ee42e22fc20d2e0790ae84c.tar.gz samba-2aa66b03bbe1acec9ee42e22fc20d2e0790ae84c.tar.xz samba-2aa66b03bbe1acec9ee42e22fc20d2e0790ae84c.zip | |
Added fixes from HEAD into 2.0 branch.
These are :
configure.in: Check for glob.h added.
libsmb/namequery.c: Fix for broken parsing of lmhosts.
smbd/reply.c:
smbd/trans2.c:
include/smb.h: Change ROUNDUP to SMB_ROUNDUP.
include/includes.h: Fixed include of glob.h
Jeremy.
Diffstat (limited to 'source/libsmb')
| -rw-r--r-- | source/libsmb/namequery.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c index f06ecc94e40..1398f7bc492 100644 --- a/source/libsmb/namequery.c +++ b/source/libsmb/namequery.c @@ -344,8 +344,7 @@ FILE *startlmhosts(char *fname) /******************************************************** Parse the next line in the lmhosts file. *********************************************************/ - -BOOL getlmhostsent( FILE *fp, char *name, int *name_type, struct in_addr *ipaddr) +BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr) { pstring line; @@ -370,7 +369,7 @@ BOOL getlmhostsent( FILE *fp, char *name, int *name_type, struct in_addr *ipaddr if (next_token(&ptr,ip ,NULL,sizeof(ip))) ++count; - if (next_token(&ptr,name ,NULL, sizeof(name))) + if (next_token(&ptr,name ,NULL, sizeof(pstring))) ++count; if (next_token(&ptr,flags,NULL, sizeof(flags))) ++count; |