diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-07-23 11:38:25 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-24 10:46:12 +1000 |
| commit | 80d3208830744f02bba5581938c9e27f473d15b9 (patch) | |
| tree | 3c9cd3bf57b70a088298770f3342df17e06838de | |
| parent | 9521cd0409add2628352ee5ef888c5a8a90fbb27 (diff) | |
| download | samba-80d3208830744f02bba5581938c9e27f473d15b9.tar.gz samba-80d3208830744f02bba5581938c9e27f473d15b9.tar.bz2 samba-80d3208830744f02bba5581938c9e27f473d15b9.zip | |
param: Make internal handler for 'server role' common
| -rw-r--r-- | lib/param/loadparm.c | 1 | ||||
| -rw-r--r-- | lib/param/param_functions.c | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 5 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index ea20e2d7f3..323b795d76 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -83,7 +83,6 @@ static bool defaults_saved = false; char *tls_dhpfile; \ char *loglevel; \ char *panic_action; \ - int server_role; \ int security; \ int domain_master; \ int domain_logons; \ diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index d12faa60e2..9ebc38119f 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -211,6 +211,7 @@ FN_GLOBAL_BOOL(passwd_chat_debug, bPasswdChatDebug) FN_GLOBAL_BOOL(registry_shares, bRegistryShares) FN_GLOBAL_BOOL(reset_on_zero_vc, bResetOnZeroVC) FN_GLOBAL_BOOL(rpc_big_endian, bRpcBigEndian) +FN_GLOBAL_BOOL(_server_role, server_role) FN_GLOBAL_BOOL(stat_cache, bStatCache) FN_GLOBAL_BOOL(syslog_only, bSyslogOnly) FN_GLOBAL_BOOL(timestamp_logs, bTimestampLogs) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3a21ac4fe8..4396e92007 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -605,7 +605,7 @@ static struct parm_struct parm_table[] = { .label = "server role", .type = P_ENUM, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(ServerRole), + .offset = GLOBAL_VAR(server_role), .special = NULL, .enum_list = enum_server_role, .flags = FLAG_BASIC | FLAG_ADVANCED, @@ -4747,7 +4747,7 @@ static void init_globals(bool reinit_globals) Globals.PrintcapCacheTime = 750; /* 12.5 minutes */ Globals.ConfigBackend = config_backend; - Globals.ServerRole = ROLE_AUTO; + Globals.server_role = ROLE_AUTO; /* Was 65535 (0xFFFF). 0x4101 matches W2K and causes major speed improvements... */ /* Discovered by 2 days of pain by Don McCall @ HP :-). */ @@ -5057,7 +5057,6 @@ char *lp_ ## fn_name(TALLOC_CTX *ctx,int i) {return(lp_string((ctx), (LP_SNUM_OK static FN_GLOBAL_BOOL(domain_logons, bDomainLogons) static FN_GLOBAL_BOOL(_readraw, bReadRaw) static FN_GLOBAL_BOOL(_writeraw, bWriteRaw) -static FN_GLOBAL_INTEGER(_server_role, ServerRole) /* If lp_statedir() and lp_cachedir() are explicitely set during the * build process or in smb.conf, we use that value. Otherwise they |