summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorShirish Kalele <kalele@samba.org>2000-05-16 01:13:16 +0000
committerShirish Kalele <kalele@samba.org>2000-05-16 01:13:16 +0000
commit651946153e41354769839fa6cbcfd36fd320efbe (patch)
treee0682dd8ef1f369e2a31846715ebc9cd2f17cc6e /source3/param
parent210f11d0e346db3c38d4d4f19cf77773537c9560 (diff)
downloadsamba-651946153e41354769839fa6cbcfd36fd320efbe.tar.gz
samba-651946153e41354769839fa6cbcfd36fd320efbe.tar.bz2
samba-651946153e41354769839fa6cbcfd36fd320efbe.zip
The new msdfs implementation that uses symlinks to point to other
servers. Very intuitive. Removed the dfs map parsing code and tdb maintenance code (files msdfs/parse_dfs_map.c & msdfs/msdfs_tdb.c), dfs map loading and unloading calls (param/loadparm.c smbd/server.c). Added code to display msdfs format symlinks as directories in a transact2_findfirst/findnext. (smbd/trans2.c) Modified msdfs/msdfs.c to use the msdfs symlinks to create dfs referrals. Changed msdfs/README to reflect new operability. (This used to be commit 6803d2574fab9e5931786d5c9aa5dc5867bb5f05)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c32
1 files changed, 6 insertions, 26 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 9acfd5c170..afb3774a54 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -371,10 +371,8 @@ typedef struct
BOOL bFakeDirCreateTimes;
BOOL bBlockingLocks;
BOOL bInheritPerms;
-#ifdef MS_DFS
- char *szDfsMap;
- BOOL bDfsMapLoaded;
-#endif
+ BOOL bMSDfsRoot;
+
char dummy[3]; /* for alignment */
} service;
@@ -485,10 +483,8 @@ static service sDefault =
False, /* bFakeDirCreateTimes */
True, /* bBlockingLocks */
False, /* bInheritPerms */
-#ifdef MS_DFS
- NULL, /* MS Dfs map path */
- False, /* bDfsMapLoaded */
-#endif
+ False, /* bMSDfsRoot */
+
"" /* dummy */
};
@@ -893,10 +889,8 @@ static struct parm_struct parm_table[] =
{"vfs object", P_STRING, P_LOCAL, &sDefault.szVfsObjectFile, handle_vfs_object, NULL, 0},
{"vfs options", P_STRING, P_LOCAL, &sDefault.szVfsOptions, NULL, NULL, 0},
-#ifdef MS_DFS
- {"dfs map", P_STRING, P_LOCAL, &sDefault.szDfsMap, NULL, NULL, FLAG_SHARE},
+ {"msdfs root", P_BOOL, P_LOCAL, &sDefault.bMSDfsRoot, NULL, NULL, FLAG_SHARE},
{"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL, FLAG_GLOBAL},
-#endif
{"Winbind options", P_SEP, P_SEPARATOR},
@@ -1422,11 +1416,7 @@ FN_LOCAL_STRING(lp_veto_files,szVetoFiles)
FN_LOCAL_STRING(lp_hide_files,szHideFiles)
FN_LOCAL_STRING(lp_veto_oplocks,szVetoOplockFiles)
FN_LOCAL_STRING(lp_driverlocation,szPrinterDriverLocation)
-
-#ifdef MS_DFS
-FN_LOCAL_STRING(lp_dfsmap,szDfsMap)
-FN_LOCAL_BOOL(lp_dfsmap_loaded,bDfsMapLoaded)
-#endif
+FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot)
FN_LOCAL_BOOL(lp_autoloaded,autoloaded)
FN_LOCAL_BOOL(lp_preexec_close,bPreexecClose)
@@ -2087,16 +2077,6 @@ static BOOL handle_source_env(char *pszParmValue,char **ptr)
return(result);
}
-
-
-#ifdef MS_DFS
-void set_dfsmap_loaded(int i,BOOL b)
-{
- pSERVICE(i)->bDfsMapLoaded = b;
-}
-
-#endif
-
/***************************************************************************
handle the interpretation of the vfs object parameter
*************************************************************************/