diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-16 19:51:35 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-16 19:51:35 +0100 |
| commit | 54dc421f5820099531a77879f52a904c2fefcf49 (patch) | |
| tree | daf0685fb9cb93e41332592f2be087686afb7ccc /source3/libsmb/libsmb_dir.c | |
| parent | d59a79e5bb425d260af3261e88422eeaf1f1359c (diff) | |
| parent | 4c3aea3f62a76fa62ead66d64941156375fc4501 (diff) | |
| download | samba-54dc421f5820099531a77879f52a904c2fefcf49.tar.gz samba-54dc421f5820099531a77879f52a904c2fefcf49.tar.bz2 samba-54dc421f5820099531a77879f52a904c2fefcf49.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/libsmb/libsmb_dir.c')
| -rw-r--r-- | source3/libsmb/libsmb_dir.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index d12e7487f6..770014b6f6 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -976,9 +976,8 @@ SMBC_readdir_ctx(SMBCCTX *context, } - dirp = (struct smbc_dirent *)context->internal->dirent; - maxlen = (sizeof(context->internal->dirent) - - sizeof(struct smbc_dirent)); + dirp = &context->internal->dirent; + maxlen = sizeof(context->internal->_dirent_name); smbc_readdir_internal(context, dirp, dirent, maxlen); @@ -1049,9 +1048,8 @@ SMBC_getdents_ctx(SMBCCTX *context, } /* Do urlencoding of next entry, if so selected */ - dirent = (struct smbc_dirent *)context->internal->dirent; - maxlen = (sizeof(context->internal->dirent) - - sizeof(struct smbc_dirent)); + dirent = &context->internal->dirent; + maxlen = sizeof(context->internal->_dirent_name); smbc_readdir_internal(context, dirent, dirlist->dirent, maxlen); |