diff options
| author | Jeremy Allison <jra@samba.org> | 2004-05-07 18:37:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:30 -0500 |
| commit | e0da56a84808c522bc7324b5d636f1cbd317a2c5 (patch) | |
| tree | 5522c069c408792851c5eb747feb5b5981373131 /source3/smbd/service.c | |
| parent | 5cb65233cd5c4f3c740ff3d06807296c2032377d (diff) | |
| download | samba-e0da56a84808c522bc7324b5d636f1cbd317a2c5.tar.gz samba-e0da56a84808c522bc7324b5d636f1cbd317a2c5.tar.bz2 samba-e0da56a84808c522bc7324b5d636f1cbd317a2c5.zip | |
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)
Diffstat (limited to 'source3/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 08b6648249..93b017e94c 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -21,12 +21,6 @@ #include "includes.h" extern struct timeval smb_last_time; -extern int case_default; -extern BOOL case_preserve; -extern BOOL short_case_preserve; -extern BOOL case_mangle; -extern BOOL case_sensitive; -extern BOOL use_mangled_map; extern userdom_struct current_user_info; @@ -62,13 +56,7 @@ BOOL set_current_service(connection_struct *conn,BOOL do_chdir) last_conn = conn; - case_default = lp_defaultcase(snum); - case_preserve = lp_preservecase(snum); - short_case_preserve = lp_shortpreservecase(snum); - case_mangle = lp_casemangle(snum); - case_sensitive = lp_casesensitive(snum); magic_char = lp_magicchar(snum); - use_mangled_map = (*lp_mangled_map(snum) ? True:False); return(True); } @@ -357,6 +345,12 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, conn->printer = (strncmp(dev,"LPT",3) == 0); conn->ipc = ((strncmp(dev,"IPC",3) == 0) || strequal(dev,"ADMIN$")); conn->dirptr = NULL; + + /* Case options for the share. */ + conn->case_sensitive = lp_casesensitive(snum); + conn->case_preserve = lp_preservecase(snum); + conn->short_case_preserve = lp_shortpreservecase(snum); + conn->veto_list = NULL; conn->hide_list = NULL; conn->veto_oplock_list = NULL; |