diff options
| -rw-r--r-- | source3/msdfs/msdfs.c | 8 | ||||
| -rw-r--r-- | source3/msdfs/parse_dfs_map.c | 54 |
2 files changed, 31 insertions, 31 deletions
diff --git a/source3/msdfs/msdfs.c b/source3/msdfs/msdfs.c index efc5b47ad7..a78f3618cb 100644 --- a/source3/msdfs/msdfs.c +++ b/source3/msdfs/msdfs.c @@ -31,7 +31,7 @@ extern uint32 global_client_caps; #define VERSION3_REFERRAL_SIZE 0x22 #define REFERRAL_HEADER_SIZE 0x08 -void create_nondfs_path(char* pathname, struct dfs_path* pdp) +static void create_nondfs_path(char* pathname, struct dfs_path* pdp) { pstrcpy(pathname,pdp->volumename); pstrcat(pathname,"\\"); @@ -40,7 +40,7 @@ void create_nondfs_path(char* pathname, struct dfs_path* pdp) /* Parse the pathname of the form \hostname\service\volume\restofthepath into the dfs_path structure */ -BOOL parse_dfs_path(char* pathname, struct dfs_path* pdp) +static BOOL parse_dfs_path(char* pathname, struct dfs_path* pdp) { pstring pathname_local; char* p,*temp; @@ -246,7 +246,6 @@ int setup_dfs_referral(char* pathname, int max_referral_level, case 2: { unsigned char uni_requestedpath[1024]; - unsigned char uni_altpath[1024]; int uni_reqpathoffset1,uni_reqpathoffset2; int uni_curroffset; int requestedpathlen=0; @@ -339,7 +338,6 @@ int setup_dfs_referral(char* pathname, int max_referral_level, case 3: { unsigned char uni_reqpath[1024]; - unsigned char uni_altpath[1024]; int uni_reqpathoffset1, uni_reqpathoffset2; int uni_curroffset; @@ -442,7 +440,7 @@ int setup_dfs_referral(char* pathname, int max_referral_level, #endif /* Trivial fn that chops off upper bytes to convert unicode to dos */ -void unistr_to_dos(char* dst,uint16* src) +void unistr_to_dos(char* dst,char* src) { pstring s; int i=0; diff --git a/source3/msdfs/parse_dfs_map.c b/source3/msdfs/parse_dfs_map.c index 30bd010089..2db32e21fd 100644 --- a/source3/msdfs/parse_dfs_map.c +++ b/source3/msdfs/parse_dfs_map.c @@ -50,9 +50,9 @@ static char* Dfs_Crop_Whitespace(char* line) if(line[0]=='#' || line[0]==';') return NULL; - for(i=0;i<PSTRING_LEN && line[i]==' ';i++); + for(i=0;i<len && line[i]==' ';i++); - if(i>=PSTRING_LEN) return NULL; + if(i>=len) return NULL; line = &line[i]; @@ -71,7 +71,7 @@ static char* Dfs_Crop_Whitespace(char* line) return line; } -BOOL parse_referral(char* s, struct referral* ref) +static BOOL parse_referral(char* s, struct referral* ref) { #define MAXTOK_IN_REFERRAL 3 char *tok[MAXTOK_IN_REFERRAL+1]; @@ -111,29 +111,7 @@ BOOL parse_referral(char* s, struct referral* ref) return True; } -void load_dfsmaps(void) -{ - int i=0; - if(!lp_host_msdfs()) - return; - - for(i=0;*lp_servicename(i) && *lp_dfsmap(i) - && !lp_dfsmap_loaded(i);i++) - { - char* dfsmapfile = lp_dfsmap(i); - DEBUG(4,("loading dfsmap for servicename: %s\n",lp_servicename(i))); - if(load_dfsmap(dfsmapfile,i)) - { - set_dfsmap_loaded(i,True); - } - else - { - DEBUG(0,("handle_dfsmap: Unable to load Dfs map file %s.\nService %s not using MS Dfs",dfsmapfile,lp_servicename(i))); - set_dfsmap_loaded(i,False); - } - - } -} + BOOL load_dfsmap(char* fname, int snum) { @@ -243,6 +221,30 @@ BOOL load_dfsmap(char* fname, int snum) msdfs_close(); return True; } + +void load_dfsmaps(void) +{ + int i=0; + if(!lp_host_msdfs()) + return; + + for(i=0;*lp_servicename(i) && *lp_dfsmap(i) + && !lp_dfsmap_loaded(i);i++) + { + char* dfsmapfile = lp_dfsmap(i); + DEBUG(4,("loading dfsmap for servicename: %s\n",lp_servicename(i))); + if(load_dfsmap(dfsmapfile,i)) + { + set_dfsmap_loaded(i,True); + } + else + { + DEBUG(0,("handle_dfsmap: Unable to load Dfs map file %s.\nService %s not using MS Dfs",dfsmapfile,lp_servicename(i))); + set_dfsmap_loaded(i,False); + } + + } +} #else /* Stub function if MS_DFS is not defined */ |