diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-07-26 15:56:15 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-26 12:23:20 +0200 |
| commit | 3e9c00112e129d7a6251b190345090b86723b249 (patch) | |
| tree | 00057ce57dc915188fb130185ee9b442102760ff /lib/param | |
| parent | 8d2ba95c90794e4ea0f2fa9a4c36223cf1aa25ea (diff) | |
| download | samba-3e9c00112e129d7a6251b190345090b86723b249.tar.gz samba-3e9c00112e129d7a6251b190345090b86723b249.tar.bz2 samba-3e9c00112e129d7a6251b190345090b86723b249.zip | |
lib/param: Merge "Ldap Options" section from source3/param
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
Diffstat (limited to 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 178 |
1 files changed, 178 insertions, 0 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 138666cd5c..a17036d09b 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -77,6 +77,10 @@ static bool defaults_saved = false; struct parmlist_entry *param_opt; \ char *szRealm; \ char *szConfigFile; \ + char *szLdapMachineSuffix; \ + char *szLdapUserSuffix; \ + char *szLdapIdmapSuffix; \ + char *szLdapGroupSuffix; \ char *szUsershareTemplateShare; \ char *szIdmapUID; \ char *szIdmapGID; \ @@ -968,6 +972,180 @@ static struct parm_struct parm_table[] = { .enum_list = NULL }, + {N_("Ldap Options"), P_SEP, P_SEPARATOR}, + + { + .label = "ldap admin dn", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szLdapAdminDn), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap delete dn", + .type = P_BOOL, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_delete_dn), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap group suffix", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szLdapGroupSuffix), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap idmap suffix", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szLdapIdmapSuffix), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap machine suffix", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szLdapMachineSuffix), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap passwd sync", + .type = P_ENUM, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_passwd_sync), + .special = NULL, + .enum_list = enum_ldap_passwd_sync, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap password sync", + .type = P_ENUM, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_passwd_sync), + .special = NULL, + .enum_list = enum_ldap_passwd_sync, + .flags = FLAG_HIDE, + }, + { + .label = "ldap replication sleep", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_replication_sleep), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap suffix", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szLdapSuffix), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap ssl", + .type = P_ENUM, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_ssl), + .special = NULL, + .enum_list = enum_ldap_ssl, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap ssl ads", + .type = P_BOOL, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_ssl_ads), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap deref", + .type = P_ENUM, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_deref), + .special = NULL, + .enum_list = enum_ldap_deref, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap follow referral", + .type = P_ENUM, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_follow_referral), + .special = NULL, + .enum_list = enum_bool_auto, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap timeout", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_timeout), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap connection timeout", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_connection_timeout), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap page size", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_page_size), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap user suffix", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szLdapUserSuffix), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap debug level", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_debug_level), + .special = handle_ldap_debug_level, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "ldap debug threshold", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(ldap_debug_threshold), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + {N_("EventLog Options"), P_SEP, P_SEPARATOR}, { |