sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

lib/param: Merge Winbind parameters from source3 into lib/param

Browse Source 
This will make the merge of the whole table smoother.

Based on an earlier patch
Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-07-24 09:06:43 +10:00
parent 19a886724a
commit c7df664448
1 changed files with 260 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

296
lib/param/loadparm.c
View File

@ -76,6 +76,9 @@ static bool defaults_saved = false;
#define LOADPARM_EXTRA_GLOBALS \
struct parmlist_entry *param_opt; \
char *szRealm; \
char *szIdmapUID; \
char *szIdmapGID; \
int winbindMaxDomainConnections; \
char *tls_keyfile; \
char *tls_certfile; \
char *tls_cafile; \
@ -166,14 +169,6 @@ static struct parm_struct parm_table[] = {
.special = NULL,
.enum_list = NULL
},
{
.label = "ncalrpc dir",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(ncalrpc_dir),
.special = NULL,
.enum_list = NULL
},
{
.label = "comment",
.type = P_STRING,
@ -1112,13 +1107,269 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "ntp signd socket directory",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szNTPSignDSocketDirectory),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{N_("Winbind options"), P_SEP, P_SEPARATOR},
{
.label = "passdb expand explicit",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bPassdbExpandExplicit),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "idmap backend",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szIdmapBackend),
.special = handle_idmap_backend,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_DEPRECATED,
},
{
.label = "idmap cache time",
.type = P_INTEGER,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(iIdmapCacheTime),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "idmap negative cache time",
.type = P_INTEGER,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(iIdmapNegativeCacheTime),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "idmap uid",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szIdmapUID),
.special = handle_idmap_uid,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_DEPRECATED,
},
{
.label = "winbind uid",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szIdmapUID),
.special = handle_idmap_uid,
.enum_list = NULL,
.flags = FLAG_HIDE,
},
{
.label = "idmap gid",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szIdmapGID),
.special = handle_idmap_gid,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_DEPRECATED,
},
{
.label = "winbind gid",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szIdmapGID),
.special = handle_idmap_gid,
.enum_list = NULL,
.flags = FLAG_HIDE,
},
{
.label = "template homedir",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szTemplateHomedir),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "template shell",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szTemplateShell),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind separator",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szWinbindSeparator),
.special = NULL,
.enum_list = NULL
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind cache time",
.type = P_INTEGER,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(winbind_cache_time),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind reconnect delay",
.type = P_INTEGER,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(winbind_reconnect_delay),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind max clients",
.type = P_INTEGER,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(winbind_max_clients),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind enum users",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bWinbindEnumUsers),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind enum groups",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bWinbindEnumGroups),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind use default domain",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bWinbindUseDefaultDomain),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind trusted domains only",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bWinbindTrustedDomainsOnly),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind nested groups",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bWinbindNestedGroups),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind expand groups",
.type = P_INTEGER,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(winbind_expand_groups),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind nss info",
.type = P_LIST,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szWinbindNssInfo),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind refresh tickets",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bWinbindRefreshTickets),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind offline logon",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bWinbindOfflineLogon),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind normalize names",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bWinbindNormalizeNames),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind rpc only",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bWinbindRpcOnly),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "create krb5 conf",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bCreateKrb5Conf),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "ncalrpc dir",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(ncalrpc_dir),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbind max domain connections",
.type = P_INTEGER,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(winbindMaxDomainConnections),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "winbindd socket directory",
@ -1147,33 +1398,6 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "template shell",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szTemplateShell),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "template homedir",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szTemplateHomedir),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "ntp signd socket directory",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szNTPSignDSocketDirectory),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{N_("DNS options"), P_SEP, P_SEPARATOR},
{