diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-05 11:11:19 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-03-05 11:11:19 +1100 |
| commit | ebe5b2835331ab259dd32bf6dc574ae999e2d36d (patch) | |
| tree | b7ce49ef619de869dd03bfd48b65f0fa175b0f33 /source3/modules/vfs_acl_tdb.c | |
| parent | 5a10d804919af205b027ee519b9fa05519913ebe (diff) | |
| parent | f85aa66ca22f29734bdacaa559737990fbe28d8a (diff) | |
| download | samba-ebe5b2835331ab259dd32bf6dc574ae999e2d36d.tar.gz samba-ebe5b2835331ab259dd32bf6dc574ae999e2d36d.tar.bz2 samba-ebe5b2835331ab259dd32bf6dc574ae999e2d36d.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
Diffstat (limited to 'source3/modules/vfs_acl_tdb.c')
| -rw-r--r-- | source3/modules/vfs_acl_tdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index 73dbca4809..a77f6d60f4 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -195,7 +195,7 @@ static NTSTATUS get_acl_blob(TALLOC_CTX *ctx, if (fsp && fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (fsp->posix_open) { + if (fsp && fsp->posix_open) { ret = SMB_VFS_LSTAT(handle->conn, name, &sbuf); } else { ret = SMB_VFS_STAT(handle->conn, name, &sbuf); @@ -513,7 +513,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, if (fsp && !fsp->is_directory && fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (fsp->posix_open) { + if (fsp && fsp->posix_open) { ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf); } else { ret = SMB_VFS_STAT(handle->conn,fname, &sbuf); |