diff options
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 37 | 
1 files changed, 1 insertions, 36 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 0a4f0556ae..126d70939c 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -183,13 +183,6 @@ typedef struct  	char *szAddShareCommand;  	char *szChangeShareCommand;  	char *szDeleteShareCommand; -        char *szEventLogOpenCommand; -        char *szEventLogReadCommand; -        char *szEventLogClearCommand; -        char *szEventLogNumRecordsCommand; -        char *szEventLogOldestRecordCommand; -	char *szEventLogCloseCommand; -        char *szEventLogControlCommand;          char **szEventLogs;  	char *szGuestaccount;  	char *szManglingMethod; @@ -608,7 +601,6 @@ static BOOL handle_netbios_scope( int snum, const char *pszParmValue, char **ptr  static BOOL handle_charset( int snum, const char *pszParmValue, char **ptr );  static BOOL handle_acl_compatibility( int snum, const char *pszParmValue, char **ptr);  static BOOL handle_printing( int snum, const char *pszParmValue, char **ptr); -static BOOL handle_eventlog( int snum, const char *pszParmValue, char **ptr);  static void set_server_role(void);  static void set_default_server_announce_type(void); @@ -1154,13 +1146,6 @@ static struct parm_struct parm_table[] = {  	{"delete share command", P_STRING, P_GLOBAL, &Globals.szDeleteShareCommand, NULL, NULL, FLAG_ADVANCED},   	{N_("EventLog Options"), P_SEP, P_SEPARATOR},  -	{"eventlog open command", P_STRING, P_GLOBAL, &Globals.szEventLogOpenCommand, handle_eventlog, NULL, FLAG_ADVANCED}, -	{"eventlog read command", P_STRING, P_GLOBAL, &Globals.szEventLogReadCommand, handle_eventlog, NULL, FLAG_ADVANCED},  -	{"eventlog clear command", P_STRING, P_GLOBAL, &Globals.szEventLogClearCommand, handle_eventlog, NULL, FLAG_ADVANCED}, -	{"eventlog num records command", P_STRING, P_GLOBAL, &Globals.szEventLogNumRecordsCommand, handle_eventlog, NULL, FLAG_ADVANCED}, -	{"eventlog oldest record command", P_STRING, P_GLOBAL, &Globals.szEventLogOldestRecordCommand, handle_eventlog, NULL, FLAG_ADVANCED}, -	{"eventlog close command", P_STRING, P_GLOBAL, &Globals.szEventLogCloseCommand, handle_eventlog, NULL, FLAG_ADVANCED}, -	{"eventlog control command", P_STRING, P_GLOBAL, &Globals.szEventLogControlCommand, handle_eventlog, NULL, FLAG_ADVANCED},  	{"eventlog list",  P_LIST, P_GLOBAL, &Globals.szEventLogs, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE},   	{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},  @@ -1581,14 +1566,6 @@ static void init_globals(void)  	string_set(&Globals.szCupsServer, "");  	string_set(&Globals.szIPrintServer, ""); -	string_set(&Globals.szEventLogOpenCommand, ""); -	string_set(&Globals.szEventLogReadCommand, ""); -	string_set(&Globals.szEventLogClearCommand, ""); -	string_set(&Globals.szEventLogNumRecordsCommand, ""); -	string_set(&Globals.szEventLogOldestRecordCommand, ""); -	string_set(&Globals.szEventLogCloseCommand, ""); -	string_set(&Globals.szEventLogControlCommand, ""); -  	Globals.winbind_cache_time = 300;	/* 5 minutes */  	Globals.bWinbindEnumUsers = True;  	Globals.bWinbindEnumGroups = True; @@ -1806,14 +1783,6 @@ FN_GLOBAL_STRING(lp_add_share_cmd, &Globals.szAddShareCommand)  FN_GLOBAL_STRING(lp_change_share_cmd, &Globals.szChangeShareCommand)  FN_GLOBAL_STRING(lp_delete_share_cmd, &Globals.szDeleteShareCommand) -FN_GLOBAL_STRING(lp_eventlog_open_cmd, &Globals.szEventLogOpenCommand) -FN_GLOBAL_STRING(lp_eventlog_read_cmd, &Globals.szEventLogReadCommand) -FN_GLOBAL_STRING(lp_eventlog_clear_cmd, &Globals.szEventLogClearCommand) -FN_GLOBAL_STRING(lp_eventlog_num_records_cmd, &Globals.szEventLogNumRecordsCommand) -FN_GLOBAL_STRING(lp_eventlog_oldest_record_cmd, &Globals.szEventLogOldestRecordCommand) -FN_GLOBAL_STRING(lp_eventlog_close_cmd, &Globals.szEventLogCloseCommand) -FN_GLOBAL_STRING(lp_eventlog_control_cmd, &Globals.szEventLogControlCommand) -  FN_GLOBAL_LIST(lp_eventlog_list, &Globals.szEventLogs)  FN_GLOBAL_BOOL(lp_disable_netbios, &Globals.bDisableNetbios) @@ -2908,11 +2877,7 @@ static BOOL handle_charset(int snum, const char *pszParmValue, char **ptr)  	return True;  } -static BOOL handle_eventlog(int snum, const char *pszParmValue, char **ptr) -{ -	string_set(ptr, pszParmValue); -	return True; -} +  static BOOL handle_workgroup(int snum, const char *pszParmValue, char **ptr)  {  | 
