diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-23 16:33:53 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-23 16:35:00 +0100 |
| commit | 5c4885a26bbdc1a5086417b63395debd2670db85 (patch) | |
| tree | ec042f16d03049bdbe7bb0f886cba6742d32b8d1 /source3/include | |
| parent | 7930206f5c80b15aded213c3f438ff0120fdea2c (diff) | |
| download | samba-5c4885a26bbdc1a5086417b63395debd2670db85.tar.gz samba-5c4885a26bbdc1a5086417b63395debd2670db85.tar.bz2 samba-5c4885a26bbdc1a5086417b63395debd2670db85.zip | |
Revert "s3: Make the implicit reference to Protocol in is_in_path() explicit"
This reverts commit f7b4151a64d8c6851e62255a7139fd00a5fc63a3.
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/include/smb_macros.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 4622118542..9b92b0d06b 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1156,8 +1156,7 @@ gid_t nametogid(const char *name); void smb_panic(const char *const why); void log_stack_trace(void); const char *readdirname(SMB_STRUCT_DIR *p); -bool is_in_path(const char *name, name_compare_entry *namelist, - enum protocol_types proto, bool case_sensitive); +bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensitive); void set_namearray(name_compare_entry **ppname_array, const char *namelist); void free_namearray(name_compare_entry *name_array); bool fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type); diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 95f427c1e7..10ee78b394 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -79,6 +79,9 @@ #define MAP_HIDDEN(conn) ((conn) && lp_map_hidden(SNUM(conn))) #define MAP_SYSTEM(conn) ((conn) && lp_map_system(SNUM(conn))) #define MAP_ARCHIVE(conn) ((conn) && lp_map_archive(SNUM(conn))) +#define IS_HIDDEN_PATH(conn,path) ((conn) && is_in_path((path),(conn)->hide_list,(conn)->case_sensitive)) +#define IS_VETO_PATH(conn,path) ((conn) && is_in_path((path),(conn)->veto_list,(conn)->case_sensitive)) +#define IS_VETO_OPLOCK_PATH(conn,path) ((conn) && is_in_path((path),(conn)->veto_oplock_list,(conn)->case_sensitive)) /* * Used by the stat cache code to check if a returned |