diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-10-05 01:42:46 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-10-05 01:42:46 +0000 |
| commit | 0531f4640a7a0154e35af8146ed46e47c5742574 (patch) | |
| tree | 19b47c913c2ba2b3a76e0a6388ba2e5bc83e8804 /source3/smbwrapper/smbw_dir.c | |
| parent | 901399b70699e4f90421c2df2df2671e000c496e (diff) | |
| download | samba-0531f4640a7a0154e35af8146ed46e47c5742574.tar.gz samba-0531f4640a7a0154e35af8146ed46e47c5742574.tar.bz2 samba-0531f4640a7a0154e35af8146ed46e47c5742574.zip | |
this gets smbwrapper working under Solaris 2.6. Not tested much yet.
(This used to be commit 6a1b346d98c10688f0995a6ab8fd155a77ead258)
Diffstat (limited to 'source3/smbwrapper/smbw_dir.c')
| -rw-r--r-- | source3/smbwrapper/smbw_dir.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source3/smbwrapper/smbw_dir.c b/source3/smbwrapper/smbw_dir.c index 913fc9662e..bd8c91682e 100644 --- a/source3/smbwrapper/smbw_dir.c +++ b/source3/smbwrapper/smbw_dir.c @@ -31,9 +31,6 @@ extern int DEBUGLEVEL; extern int smbw_busy; -#define DIRP_SIZE (sizeof(fstring) + 12) - - /***************************************************** map a fd to a smbw_dir structure *******************************************************/ @@ -641,11 +638,13 @@ read one entry from a directory struct dirent *smbw_readdir(DIR *dirp) { struct smbw_dir *d = (struct smbw_dir *)dirp; - static char buf[DIRP_SIZE]; - struct dirent *de = (struct dirent *)buf; + static union { + char buf[DIRP_SIZE]; + struct dirent de; + } dbuf; - if (smbw_getdents(d->fd, de, DIRP_SIZE) > 0) - return de; + if (smbw_getdents(d->fd, &dbuf.de, DIRP_SIZE) > 0) + return &dbuf.de; return NULL; } |