diff options
Diffstat (limited to 'source3/param/loadparm.c')
| -rw-r--r-- | source3/param/loadparm.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 9947aca5ea..0e095c44bf 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -129,8 +129,6 @@ typedef struct char *szCharacterSet; char *szLogonScript; char *szLogonPath; - char *szVetoFiles; - char *szHideFiles; char *szSmbrun; char *szWINSserver; char *szInterfaces; @@ -214,6 +212,8 @@ typedef struct char *szMagicScript; char *szMagicOutput; char *szMangledMap; + char *szVetoFiles; + char *szHideFiles; char *comment; char *force_user; char *force_group; @@ -291,6 +291,8 @@ static service sDefault = NULL, /* szMagicScript */ NULL, /* szMagicOutput */ NULL, /* szMangledMap */ + NULL, /* szVetoFiles */ + DEFAULT_FILES_TO_HIDE, /* szHideFiles */ NULL, /* comment */ NULL, /* force user */ NULL, /* force group */ @@ -395,8 +397,6 @@ 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}, - {"hide files", P_STRING, P_GLOBAL, &Globals.szHideFiles, 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,6 +509,8 @@ 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}, @@ -623,7 +625,6 @@ static void init_globals(void) Globals.shmem_size = SHMEM_SIZE; Globals.shmem_hash_size = SHMEM_HASH_SIZE; Globals.bUnixRealname = False; - Globals.szHideFiles = DEFAULT_FILES_TO_HIDE; #if (defined(NETGROUP) && defined(AUTOMOUNT)) Globals.bNISHomeMap = False; string_set(&Globals.szNISHomeMapName, "auto.home"); @@ -798,8 +799,6 @@ 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_hide_files,&Globals.szHideFiles) FN_GLOBAL_STRING(lp_remote_announce,&Globals.szRemoteAnnounce) FN_GLOBAL_STRING(lp_wins_server,&Globals.szWINSserver) FN_GLOBAL_STRING(lp_interfaces,&Globals.szInterfaces) @@ -879,6 +878,8 @@ 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) |