diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-06-16 12:01:13 -0700 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-06-17 20:11:53 -0700 |
| commit | 4e3656b8d1d0bf8c0c4ade01332e7384ea890810 (patch) | |
| tree | efcb240c8b0dbdd791e01dfe62a50f4cfdca47e5 /source3/smbd/filename.c | |
| parent | 5cfac1a1bd59712d7a771d3631e869c5d078a0f3 (diff) | |
| download | samba-4e3656b8d1d0bf8c0c4ade01332e7384ea890810.tar.gz samba-4e3656b8d1d0bf8c0c4ade01332e7384ea890810.tar.bz2 samba-4e3656b8d1d0bf8c0c4ade01332e7384ea890810.zip | |
s3: Change SMB_VFS_OPEN to take an smb_filename struct
This was a little messy because of all of the vfs modules I had to
touch. Most of them were pretty straight forward, but the streams
modules required a little attention to handle smb_filename. Since the
use of smb_filename enables the vfs modules to access the raw,
over-the-wire stream, a little bit of the handling that was being done
by split_ntfs_stream_name has now been shifted into the individual
stream modules. It may be a little more code, but overall it gives
more flexibility to the streams modules, while also allowing correct
stream handling.
Diffstat (limited to 'source3/smbd/filename.c')
| -rw-r--r-- | source3/smbd/filename.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index 0f69ce4820..456caf590b 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -115,8 +115,6 @@ NTSTATUS create_synthetic_smb_fname(TALLOC_CTX *ctx, const char *base_name, { struct smb_filename smb_fname_loc; - SMB_ASSERT(psbuf); - ZERO_STRUCT(smb_fname_loc); /* Setup the base_name/stream_name. */ @@ -124,7 +122,8 @@ NTSTATUS create_synthetic_smb_fname(TALLOC_CTX *ctx, const char *base_name, smb_fname_loc.stream_name = CONST_DISCARD(char *, stream_name); /* Copy the psbuf if one was given. */ - smb_fname_loc.st = *psbuf; + if (psbuf) + smb_fname_loc.st = *psbuf; /* Let copy_smb_filename() do the heavy lifting. */ return copy_smb_filename(ctx, &smb_fname_loc, smb_fname_out); |