diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-21 19:26:25 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-21 20:49:17 +0100 |
| commit | f7b4151a64d8c6851e62255a7139fd00a5fc63a3 (patch) | |
| tree | 9e6f78c5771207fff61519f92aafe69e8bd32a91 /source3/include | |
| parent | 1e22899d268ae5a089f941a204413c07ee64fc78 (diff) | |
| download | samba-f7b4151a64d8c6851e62255a7139fd00a5fc63a3.tar.gz samba-f7b4151a64d8c6851e62255a7139fd00a5fc63a3.tar.bz2 samba-f7b4151a64d8c6851e62255a7139fd00a5fc63a3.zip | |
s3: Make the implicit reference to Protocol in is_in_path() explicit
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, 2 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index fa0a69ea58..0efd8f0e35 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1158,7 +1158,8 @@ 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, bool case_sensitive); +bool is_in_path(const char *name, name_compare_entry *namelist, + enum protocol_types proto, 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 10ee78b394..95f427c1e7 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -79,9 +79,6 @@ #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 |