From 4140f2bfc141ee9a91723d274344769f8b11a5f9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 24 Oct 1998 06:36:22 +0000 Subject: make sure that apps can't close one of the internal smbw file descriptors by catching close attempts on those fds and returning EBADF. (This used to be commit 9d863fb1681a5b03696552e1d93fe339b4bae455) --- source3/smbwrapper/smbw.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'source3/smbwrapper/smbw.c') diff --git a/source3/smbwrapper/smbw.c b/source3/smbwrapper/smbw.c index c09d7509f0..622581b7a6 100644 --- a/source3/smbwrapper/smbw.c +++ b/source3/smbwrapper/smbw.c @@ -125,6 +125,25 @@ int smbw_fd(int fd) return smbw_file_bmap && bitmap_query(smbw_file_bmap, fd); } +/***************************************************** +determine if a file descriptor is an internal smbw fd +*******************************************************/ +int smbw_local_fd(int fd) +{ + struct smbw_server *srv; + + smbw_init(); + + if (smbw_busy) return 0; + if (smbw_shared_fd(fd)) return 1; + + for (srv=smbw_srvs;srv;srv=srv->next) { + if (srv->cli.fd == fd) return 1; + } + + return 0; +} + /***************************************************** a crude inode number generator *******************************************************/ @@ -736,7 +755,6 @@ ssize_t smbw_write(int fd, void *buf, size_t count) file = smbw_file(fd); if (!file) { - DEBUG(3,("bad fd in read\n")); errno = EBADF; smbw_busy--; return -1; @@ -768,7 +786,6 @@ ssize_t smbw_pwrite(int fd, void *buf, size_t count, off_t ofs) file = smbw_file(fd); if (!file) { - DEBUG(3,("bad fd in read\n")); errno = EBADF; smbw_busy--; return -1; -- cgit