The branch, master has been updated
via 221a430 lib/param: Merge VFS and MSDFS parameters from source3 into
lib/param
via c7df664 lib/param: Merge Winbind parameters from source3 into
lib/param
via 19a8867 lib/param: Merge DNS parameters with source3 param
via 9ee084f lib/param: Rearrange AD DC options to make a merge with the
source3 table easier
via 222850b lib/param: Re-arrange TLS parameters into their own section
via c1065ff lib/param: Add handler overrides
via 3367fd0 lib/param: Merge handling of security/domain master/domain
logons/server role
via b62b031 lib/param: Make lp_usershare_max_shares() a common parameter
via f356242 lib/param: Move all enum declarations to lib/param
from 280d187 lib/param: Rename param_enums.c to param_table.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 221a430e229d130d01fa649fadfd95714847c391
Author: Andrew Bartlett <[email protected]>
Date: Tue Jul 24 09:42:03 2012 +1000
lib/param: Merge VFS and MSDFS parameters from source3 into lib/param
This will make the merge of the whole table smoother.
Based on an earlier patch
Pair-Programmed-With: Andrew Tridgell <[email protected]>
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <[email protected]>
Autobuild-Date(master): Tue Jul 24 12:53:17 CEST 2012 on sn-devel-104
commit c7df66444805b8eec8f3ae5749b0da94f2674219
Author: Andrew Bartlett <[email protected]>
Date: Tue Jul 24 09:06:43 2012 +1000
lib/param: Merge Winbind parameters from source3 into lib/param
This will make the merge of the whole table smoother.
Based on an earlier patch
Pair-Programmed-With: Andrew Tridgell <[email protected]>
Andrew Bartlett
commit 19a886724a75416c5565673d28d397ae91d710a1
Author: Andrew Bartlett <[email protected]>
Date: Tue Jul 24 09:04:35 2012 +1000
lib/param: Merge DNS parameters with source3 param
This will make the merge of the whole table smoother.
Based on an earlier patch
Pair-Programmed-With: Andrew Tridgell <[email protected]>
Andrew Bartlett
commit 9ee084fd390414e68687a98b82fbb28e32ed569e
Author: Andrew Bartlett <[email protected]>
Date: Tue Jul 24 08:59:05 2012 +1000
lib/param: Rearrange AD DC options to make a merge with the source3 table
easier
Andrew Bartlett
commit 222850bf80dca69c1ee920d95b6b0a1f48fc589b
Author: Andrew Bartlett <[email protected]>
Date: Mon Jul 23 13:51:18 2012 +1000
lib/param: Re-arrange TLS parameters into their own section
This makes the merge with the source3 table less disruptive
Based on an earlier patch:
Pair-Programmed-With: Andrew Tridgell <[email protected]>
Andrew Bartlett
commit c1065ff073746290f8f79bdb0bbe8a862530d587
Author: Andrew Bartlett <[email protected]>
Date: Tue Jul 24 09:48:32 2012 +1000
lib/param: Add handler overrides
These #defines allow us to merge the parameter table without providing the
handler functions quite yet. This helps us do this task in stages.
Andrew Bartlett
commit 3367fd01d4711c481efc8c56fb424ba3bab68dab
Author: Andrew Bartlett <[email protected]>
Date: Mon Jul 23 13:32:31 2012 +1000
lib/param: Merge handling of security/domain master/domain logons/server
role
This ensures that the same input parameters always gives the same
output values in both loadparm systems.
Andrew Bartlett
commit b62b0318155e0c22a0a62ec6735f507b1b6c0f5d
Author: Andrew Bartlett <[email protected]>
Date: Mon Jul 23 12:47:41 2012 +1000
lib/param: Make lp_usershare_max_shares() a common parameter
Pair-Programmed-With: Andrew Tridgell <[email protected]>
commit f3562424b6079065319e6a5362e5c7cdea36140e
Author: Andrew Bartlett <[email protected]>
Date: Mon Jul 23 12:47:01 2012 +1000
lib/param: Move all enum declarations to lib/param
This is in preperation for the parameter table being made common.
Andrew Bartlett
Pair-Programmed-With: Andrew Tridgell <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/param/loadparm.c | 563 ++++++++++++++++++++++++++++----------
lib/param/loadparm.h | 85 ++++++
lib/param/param_functions.c | 6 +-
lib/param/param_table.c | 134 +++++++++
libgpo/gpo_ldap.c | 1 +
script/mks3param.pl | 2 -
source3/auth/auth_generic.c | 1 +
source3/auth/auth_util.c | 1 +
source3/auth/user_krb5.c | 1 +
source3/include/ads.h | 11 -
source3/include/includes.h | 2 +
source3/include/printing.h | 1 +
source3/include/proto.h | 4 +
source3/include/smb.h | 61 ----
source3/lib/smbldap.c | 1 +
source3/lib/util_str.c | 1 +
source3/libads/kerberos_util.c | 1 +
source3/libads/ldap.c | 1 +
source3/libads/ldap_utils.c | 1 +
source3/libads/ndr.c | 1 +
source3/libads/sasl.c | 1 +
source3/libnet/libnet_join.c | 1 +
source3/librpc/crypto/gse_krb5.c | 1 +
source3/libsmb/namequery_dc.c | 1 +
source3/param/loadparm.c | 151 +----------
source3/param/loadparm_ctx.c | 6 +-
source3/passdb/pdb_ldap.c | 1 +
source3/smbd/dosmode.c | 1 +
source3/smbd/mangle_hash.c | 1 +
source3/smbd/posix_acls.c | 1 +
source3/utils/net_ads.c | 1 +
source3/utils/ntlm_auth.c | 1 +
source3/winbindd/winbindd_cm.c | 1 +
source3/winbindd/winbindd_dual.c | 1 +
34 files changed, 690 insertions(+), 358 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index e744e79..a5fa3c9 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -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; \
@@ -83,15 +86,30 @@ static bool defaults_saved = false;
char *tls_dhpfile; \
char *loglevel; \
char *panic_action; \
- int security; \
- int domain_master; \
- int domain_logons; \
int bPreferredMaster;
#include "lib/param/param_global.h"
#define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
+/* we don't need a special handler for "dos charset" and "unix charset" */
+#define handle_dos_charset NULL
+#define handle_charset NULL
+
+/* these are parameter handlers which are not needed in the
+ * non-source3 code
+ */
+#define handle_netbios_aliases NULL
+#define handle_debug_list NULL
+#define handle_printing NULL
+#define handle_ldap_debug_level NULL
+#define handle_idmap_backend NULL
+#define handle_idmap_uid NULL
+#define handle_idmap_gid NULL
+
+#ifndef N_
+#define N_(x) x
+#endif
/* prototypes for the special type handlers */
static bool handle_include(struct loadparm_context *lp_ctx, int unused,
@@ -123,7 +141,7 @@ static struct parm_struct parm_table[] = {
.label = "domain logons",
.type = P_ENUM,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(domain_logons),
+ .offset = GLOBAL_VAR(bDomainLogons),
.special = NULL,
.enum_list = enum_bool_auto
},
@@ -152,14 +170,6 @@ static struct parm_struct parm_table[] = {
.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,
.p_class = P_LOCAL,
@@ -258,14 +268,6 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED | FLAG_WIZARD,
},
{
- .label = "ntvfs handler",
- .type = P_LIST,
- .p_class = P_LOCAL,
- .offset = LOCAL_VAR(ntvfs_handler),
- .special = NULL,
- .enum_list = NULL
- },
- {
.label = "passdb backend",
.type = P_STRING,
.p_class = P_GLOBAL,
@@ -273,22 +275,6 @@ static struct parm_struct parm_table[] = {
.special = NULL,
.enum_list = NULL
},
- {
- .label = "dcerpc endpoint servers",
- .type = P_LIST,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(dcerpc_ep_servers),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "server services",
- .type = P_LIST,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(server_services),
- .special = NULL,
- .enum_list = NULL
- },
{
.label = "security",
@@ -552,54 +538,6 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL
},
{
- .label = "tls enabled",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(tls_enabled),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "tls keyfile",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(tls_keyfile),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "tls certfile",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(tls_certfile),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "tls cafile",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(tls_cafile),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "tls crlfile",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(tls_crlfile),
- .special = NULL,
- .enum_list = NULL
- },
- {
- .label = "tls dh params file",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(tls_dhpfile),
- .special = NULL,
- .enum_list = NULL
- },
- {
.label = "large readwrite",
.type = P_BOOL,
.p_class = P_GLOBAL,
@@ -1029,14 +967,6 @@ static struct parm_struct parm_table[] = {
},
{
- .label = "share backend",
- .type = P_STRING,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szShareBackend),
- .special = NULL,
- .enum_list = NULL
- },
- {
.label = "preload",
.type = P_STRING,
.p_class = P_GLOBAL,
@@ -1161,12 +1091,56 @@ static struct parm_struct parm_table[] = {
},
{
+ .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_("VFS module options"), P_SEP, P_SEPARATOR},
+
+ {
+ .label = "vfs objects",
+ .type = P_LIST,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(szVfsObjects),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
+ },
+ {
+ .label = "vfs object",
+ .type = P_LIST,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(szVfsObjects),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_HIDE,
+ },
+
+
+ {N_("MSDFS options"), P_SEP, P_SEPARATOR},
+
+ {
.label = "msdfs root",
.type = P_BOOL,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(bMSDfsRoot),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
+ },
+ {
+ .label = "msdfs proxy",
+ .type = P_STRING,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(szMSDfsProxy),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "host msdfs",
@@ -1177,37 +1151,86 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
+
+ {N_("Winbind options"), P_SEP, P_SEPARATOR},
+
{
- .label = "winbind separator",
- .type = P_STRING,
+ .label = "passdb expand explicit",
+ .type = P_BOOL,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szWinbindSeparator),
+ .offset = GLOBAL_VAR(bPassdbExpandExplicit),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
- .label = "winbindd socket directory",
+ .label = "idmap backend",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szWinbinddSocketDirectory),
+ .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 = "winbindd privileged socket directory",
- .type = P_STRING,
+ .label = "idmap negative cache time",
+ .type = P_INTEGER,
.p_class = P_GLOBAL,
- .offset =
GLOBAL_VAR(szWinbinddPrivilegedSocketDirectory),
+ .offset = GLOBAL_VAR(iIdmapNegativeCacheTime),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
- .label = "winbind sealed pipes",
- .type = P_BOOL,
+ .label = "idmap uid",
+ .type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bWinbindSealedPipes),
+ .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,
@@ -1222,69 +1245,197 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
- .label = "template homedir",
+ .label = "winbind separator",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szTemplateHomedir),
+ .offset = GLOBAL_VAR(szWinbindSeparator),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
- .label = "ntp signd socket directory",
- .type = P_STRING,
+ .label = "winbind cache time",
+ .type = P_INTEGER,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szNTPSignDSocketDirectory),
+ .offset = GLOBAL_VAR(winbind_cache_time),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
- .label = "rndc command",
- .type = P_CMDLIST,
+ .label = "winbind reconnect delay",
+ .type = P_INTEGER,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szRNDCCommand),
+ .offset = GLOBAL_VAR(winbind_reconnect_delay),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
- .label = "dns update command",
- .type = P_CMDLIST,
+ .label = "winbind max clients",
+ .type = P_INTEGER,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szDNSUpdateCommand),
+ .offset = GLOBAL_VAR(winbind_max_clients),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
- .label = "spn update command",
- .type = P_CMDLIST,
+ .label = "winbind enum users",
+ .type = P_BOOL,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szSPNUpdateCommand),
+ .offset = GLOBAL_VAR(bWinbindEnumUsers),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
- .label = "samba kcc command",
- .type = P_CMDLIST,
+ .label = "winbind enum groups",
+ .type = P_BOOL,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szSambaKCCCommand),
+ .offset = GLOBAL_VAR(bWinbindEnumGroups),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
- .label = "nsupdate command",
- .type = P_CMDLIST,
+ .label = "winbind use default domain",
+ .type = P_BOOL,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szNSUpdateCommand),
+ .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),
--
Samba Shared Repository
