summaryrefslogtreecommitdiff
path: root/source3/msdfs
diff options
context:
space:
mode:
authorShirish Kalele <kalele@samba.org>2000-04-17 22:40:02 +0000
committerShirish Kalele <kalele@samba.org>2000-04-17 22:40:02 +0000
commitbcaf1211f2f4450db48d98e703805191687cf86d (patch)
treeb534dd5bc2ab336f06b3ca048aa14f42597ed190 /source3/msdfs
parent483e61b97fea28b397e10881683c5bad822fc912 (diff)
downloadsamba-bcaf1211f2f4450db48d98e703805191687cf86d.tar.gz
samba-bcaf1211f2f4450db48d98e703805191687cf86d.tar.bz2
samba-bcaf1211f2f4450db48d98e703805191687cf86d.zip
Corrected minor parsing errors.
Not adding a Dfs junction to msdfs.tdb if it doesn't have any referred paths as parsed from the dfsmap file. (This used to be commit 462ea8b7fdaa528c3e9bfaca4fdd031888157124)
Diffstat (limited to 'source3/msdfs')
-rw-r--r--source3/msdfs/msdfs.c2
-rw-r--r--source3/msdfs/parse_dfs_map.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/source3/msdfs/msdfs.c b/source3/msdfs/msdfs.c
index 05e1f221b8..f1b19dfe02 100644
--- a/source3/msdfs/msdfs.c
+++ b/source3/msdfs/msdfs.c
@@ -60,7 +60,7 @@ static BOOL parse_dfs_path(char* pathname, struct dfs_path* pdp)
*/
trim_string(temp,"\\","\\");
- DEBUG(10,("temp in parse_dfs_path: .%s. after trimming \'s\n",temp));
+ DEBUG(10,("temp in parse_dfs_path: .%s. after trimming \\'s\n",temp));
/* now tokenize */
/* parse out hostname */
diff --git a/source3/msdfs/parse_dfs_map.c b/source3/msdfs/parse_dfs_map.c
index 24d8ca8b3d..df6b89bbfa 100644
--- a/source3/msdfs/parse_dfs_map.c
+++ b/source3/msdfs/parse_dfs_map.c
@@ -50,7 +50,7 @@ static char* Dfs_Crop_Whitespace(char* line)
if(line[0]=='#' || line[0]==';') return NULL;
- for(i=0;i<len && line[i]==' ';i++);
+ for(i=0;i<len && isspace(line[i]);i++);
if(i>=len) return NULL;
@@ -168,9 +168,10 @@ static BOOL load_dfsmap(char* fname, int snum)
if(line[0]!='\\')
{
+ /* a new junction definition encountered */
- /* a junction encountered. add the current junction first */
- if(junction)
+ /* add the current junction if it has any referrals defined */
+ if(junction && ref_count!=0)
{
junction->referral_count = ref_count;
junction->referral_list = tmp_ref_array;