diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-07-24 18:38:40 -0700 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-07-24 18:51:41 -0700 |
| commit | f49f3fcb0127b6ed19fec94f93658180ead04ac5 (patch) | |
| tree | 0a954660d72ff5e03b6a370f3e6bad68d0ce6f74 /source3/include | |
| parent | 7197ba3abd6dfad74a28d5e3f8a73367ab22810b (diff) | |
| download | samba-f49f3fcb0127b6ed19fec94f93658180ead04ac5.tar.gz samba-f49f3fcb0127b6ed19fec94f93658180ead04ac5.tar.bz2 samba-f49f3fcb0127b6ed19fec94f93658180ead04ac5.zip | |
s3: Convert a few callers of unix_convert() over to filename_convert()
This patch also changes the unix convert flags to make sure the
correct semantics are preservered for allowing/disallowing wildcards
in the last component of the path.
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/include/smb.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 92386f5fae..aed2c4c0f7 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6846,7 +6846,8 @@ void reply_ulogoffX(struct smb_request *req); void reply_mknew(struct smb_request *req); void reply_ctemp(struct smb_request *req); NTSTATUS unlink_internals(connection_struct *conn, struct smb_request *req, - uint32 dirtype, const char *name_in, bool has_wild); + uint32 dirtype, struct smb_filename *smb_fname, + bool has_wild); void reply_unlink(struct smb_request *req); void reply_readbraw(struct smb_request *req); void reply_lockread(struct smb_request *req); diff --git a/source3/include/smb.h b/source3/include/smb.h index 1c4ac54722..6ccdd968a3 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1900,7 +1900,8 @@ struct smb_file_time { * unix_convert_flags */ #define UCF_SAVE_LCOMP 0x00000001 -#define UCF_ALLOW_WCARD_LCOMP 0x00000002 +#define UCF_ALWAYS_ALLOW_WCARD_LCOMP 0x00000002 +#define UCF_COND_ALLOW_WCARD_LCOMP 0x00000004 /* * smb_filename |