sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

Removed unused vfs_read_data() function at the request of tridge.

Browse Source 
Removed unnecessary SSL stuff from vfs_write_data().
(This used to be commit fdbe79c1c3061c844c1eb859e3e40634a098a8f3)
This commit is contained in:
Tim Potter 1999-04-14 07:21:48 +00:00
parent 069f1b5ff2
commit bc6858805b
1 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
source3/smbd/vfs.c
View File

@ -216,46 +216,6 @@ BOOL vfs_file_exist(connection_struct *conn,char *fname,SMB_STRUCT_STAT *sbuf)
return(S_ISREG(sbuf->st_mode));
}
/****************************************************************************
read data from the client vfs, reading exactly N bytes.
****************************************************************************/
ssize_t vfs_read_data(files_struct *fsp,char *buffer,size_t N)
{
ssize_t ret;
size_t total=0;
int fd = fsp->fd_ptr->fd;
extern int smb_read_error;
smb_read_error = 0;
while (total < N)
{
#ifdef WITH_SSL
DEBUG(0, ("WARNING: read_data() called with SSL enabled\n"));
if(fd == sslFd){
ret = SSL_read(ssl, buffer + total, N - total);
}else{
ret = read(fd,buffer + total,N - total);
}
#else /* WITH_SSL */
ret = fsp->conn->vfs_ops.read(fd,buffer + total,N - total);
#endif /* WITH_SSL */
if (ret == 0)
{
smb_read_error = READ_EOF;
return 0;
}
if (ret == -1)
{
smb_read_error = READ_ERROR;
return -1;
}
total += ret;
}
return (ssize_t)total;
}
/****************************************************************************
write data to a fd on the vfs
****************************************************************************/
@ -267,16 +227,7 @@ ssize_t vfs_write_data(files_struct *fsp,char *buffer,size_t N)
while (total < N)
{
#ifdef WITH_SSL
DEBUG(0, ("WARNING: write_data called with SSL enabled\n"));
if(fd == sslFd){
ret = SSL_write(ssl,buffer + total,N - total);
}else{
ret = write(fd,buffer + total,N - total);
}
#else /* WITH_SSL */
ret = fsp->conn->vfs_ops.write(fd,buffer + total,N - total);
#endif /* WITH_SSL */
if (ret == -1) return -1;
if (ret == 0) return total;