diff options
| -rw-r--r-- | source3/script/addtosmbpass | 2 | ||||
| -rw-r--r-- | source3/smbd/fileio.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/script/addtosmbpass b/source3/script/addtosmbpass index 84a7e6fac0..bc82851c52 100644 --- a/source3/script/addtosmbpass +++ b/source3/script/addtosmbpass @@ -41,7 +41,7 @@ BEGIN { { print $0; for(name in names) { - if($1 ~ name) { + if($1 == name) { delete names[name]; } } diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c index 45ad959a3c..7fbf6e2a37 100644 --- a/source3/smbd/fileio.c +++ b/source3/smbd/fileio.c @@ -141,7 +141,7 @@ static unsigned int allocated_write_caches; static unsigned int num_write_caches; /**************************************************************************** - *Really* write to a file + *Really* write to a file. ****************************************************************************/ static ssize_t real_write_file(files_struct *fsp,char *data,SMB_OFF_T pos, size_t n) @@ -149,7 +149,7 @@ static ssize_t real_write_file(files_struct *fsp,char *data,SMB_OFF_T pos, size_ if ((pos != -1) && (seek_file(fsp,pos) == -1)) return -1; - return write_data(fsp->fd,data,n); + return vfs_write_data(fsp,data,n); } /**************************************************************************** |