From e0da56a84808c522bc7324b5d636f1cbd317a2c5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 7 May 2004 18:37:47 +0000 Subject: r570: Remove lots of globals to handle case issues - move them to connection struct entries (as they should have been from the start). Jerry, once you've cut over to 3.0.4 release branch I'll add this to 3.0 also. - Jerry cut over :-). Jeremy. (This used to be commit 578a508509d21226ad3332fc54c3ab54cd8ae452) --- source3/include/mangle.h | 2 +- source3/include/smb.h | 5 +++++ source3/include/smb_macros.h | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'source3/include') diff --git a/source3/include/mangle.h b/source3/include/mangle.h index 769278d828..1d7cdf7362 100644 --- a/source3/include/mangle.h +++ b/source3/include/mangle.h @@ -9,6 +9,6 @@ struct mangle_fns { BOOL (*is_8_3)(const char *fname, BOOL check_case, BOOL allow_wildcards); void (*reset)(void); BOOL (*check_cache)(char *s); - void (*name_map)(char *OutName, BOOL need83, BOOL cache83); + void (*name_map)(char *OutName, BOOL need83, BOOL cache83, int default_case); }; #endif /* _MANGLE_H_ */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 30eb82ddf5..54a69d1433 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -503,6 +503,11 @@ typedef struct connection_struct time_t lastused; BOOL used; int num_files_open; + + BOOL case_sensitive; + BOOL case_preserve; + BOOL short_case_preserve; + name_compare_entry *hide_list; /* Per-share list of files to return as hidden. */ name_compare_entry *veto_list; /* Per-share list of files to veto (never show). */ name_compare_entry *veto_oplock_list; /* Per-share list of files to refuse oplocks on. */ diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index e847714443..bcbaa64f86 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -122,9 +122,9 @@ #define MAP_HIDDEN(conn) ((conn) && lp_map_hidden((conn)->service)) #define MAP_SYSTEM(conn) ((conn) && lp_map_system((conn)->service)) #define MAP_ARCHIVE(conn) ((conn) && lp_map_archive((conn)->service)) -#define IS_HIDDEN_PATH(conn,path) ((conn) && is_in_path((path),(conn)->hide_list)) -#define IS_VETO_PATH(conn,path) ((conn) && is_in_path((path),(conn)->veto_list)) -#define IS_VETO_OPLOCK_PATH(conn,path) ((conn) && is_in_path((path),(conn)->veto_oplock_list)) +#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 -- cgit