summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-08-25 20:44:33 +0000
committerJeremy Allison <jra@samba.org>2000-08-25 20:44:33 +0000
commitace6739f5e8b9cc3139c5ea1d42ab481856dd4c5 (patch)
tree7e814134c42bd639f8cc517947624463a2d50f44
parentc79b92bbd8d455e98486b68a2a9e1f9cb5f7905f (diff)
downloadsamba-ace6739f5e8b9cc3139c5ea1d42ab481856dd4c5.tar.gz
samba-ace6739f5e8b9cc3139c5ea1d42ab481856dd4c5.tar.bz2
samba-ace6739f5e8b9cc3139c5ea1d42ab481856dd4c5.zip
vfs write data fix. Fix for name matching in addtosmbpass
Jeremy. (This used to be commit 85738b7ee1ea6d88999d6aedc51a2daf545cb8b8)
-rw-r--r--source3/script/addtosmbpass2
-rw-r--r--source3/smbd/fileio.c4
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);
}
/****************************************************************************