summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1997-07-01 20:50:57 +0000
committerSamba Release Account <samba-bugs@samba.org>1997-07-01 20:50:57 +0000
commit1599e41ec42998fdf05a3b22c3f3a93f8b4832ed (patch)
tree885e0c21a8938455fc8014438bcf6b5a16c5b668 /source3/param
parentce9baa3bac6eba5f7a468557572f342d3ba918ec (diff)
downloadsamba-1599e41ec42998fdf05a3b22c3f3a93f8b4832ed.tar.gz
samba-1599e41ec42998fdf05a3b22c3f3a93f8b4832ed.tar.bz2
samba-1599e41ec42998fdf05a3b22c3f3a93f8b4832ed.zip
Rolled back Lukes changes. Not quite ready for prime time.
Jeremy (jallison@whistle.com) (This used to be commit ed04ec7ab8b8e73b5442bdef03d5a3c994247b4e)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 0e095c44bf..9d3850b242 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -129,6 +129,7 @@ typedef struct
char *szCharacterSet;
char *szLogonScript;
char *szLogonPath;
+ char *szVetoFiles;
char *szSmbrun;
char *szWINSserver;
char *szInterfaces;
@@ -212,8 +213,6 @@ typedef struct
char *szMagicScript;
char *szMagicOutput;
char *szMangledMap;
- char *szVetoFiles;
- char *szHideFiles;
char *comment;
char *force_user;
char *force_group;
@@ -291,8 +290,6 @@ static service sDefault =
NULL, /* szMagicScript */
NULL, /* szMagicOutput */
NULL, /* szMangledMap */
- NULL, /* szVetoFiles */
- DEFAULT_FILES_TO_HIDE, /* szHideFiles */
NULL, /* comment */
NULL, /* force user */
NULL, /* force group */
@@ -397,6 +394,7 @@ struct parm_struct
{"socket options", P_GSTRING, P_GLOBAL, user_socket_options, NULL},
{"netbios name", P_UGSTRING,P_GLOBAL, myname, NULL},
{"smbrun", P_STRING, P_GLOBAL, &Globals.szSmbrun, NULL},
+ {"veto files", P_STRING, P_GLOBAL, &Globals.szVetoFiles, NULL},
{"log file", P_STRING, P_GLOBAL, &Globals.szLogFile, NULL},
{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL},
{"smb passwd file", P_STRING, P_GLOBAL, &Globals.szSMBPasswdFile, NULL},
@@ -509,8 +507,6 @@ struct parm_struct
{"set directory", P_BOOLREV, P_LOCAL, &sDefault.bNo_set_dir, NULL},
{"status", P_BOOL, P_LOCAL, &sDefault.status, NULL},
{"hide dot files", P_BOOL, P_LOCAL, &sDefault.bHideDotFiles, NULL},
- {"veto files", P_STRING, P_LOCAL, &sDefault.szVetoFiles, NULL},
- {"hide files", P_STRING, P_LOCAL, &sDefault.szHideFiles, NULL},
{"guest only", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL},
{"only guest", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL},
{"guest ok", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL},
@@ -799,6 +795,7 @@ FN_GLOBAL_STRING(lp_username_map,&Globals.szUsernameMap)
FN_GLOBAL_STRING(lp_character_set,&Globals.szCharacterSet)
FN_GLOBAL_STRING(lp_logon_script,&Globals.szLogonScript)
FN_GLOBAL_STRING(lp_logon_path,&Globals.szLogonPath)
+FN_GLOBAL_STRING(lp_veto_files,&Globals.szVetoFiles)
FN_GLOBAL_STRING(lp_remote_announce,&Globals.szRemoteAnnounce)
FN_GLOBAL_STRING(lp_wins_server,&Globals.szWINSserver)
FN_GLOBAL_STRING(lp_interfaces,&Globals.szInterfaces)
@@ -878,8 +875,6 @@ FN_LOCAL_STRING(lp_readlist,readlist)
FN_LOCAL_STRING(lp_writelist,writelist)
FN_LOCAL_STRING(lp_volume,volume)
FN_LOCAL_STRING(lp_mangled_map,szMangledMap)
-FN_LOCAL_STRING(lp_veto_files,szVetoFiles)
-FN_LOCAL_STRING(lp_hide_files,szHideFiles)
FN_LOCAL_BOOL(lp_alternate_permissions,bAlternatePerm)
FN_LOCAL_BOOL(lp_revalidate,bRevalidate)