The branch, master has been updated
via 115a88e lib/param: Merge "Filename Handling" section from
source3/param
via deb9a05 lib/param: Merge "Domain Options" section from source3/param
via 932f0a6 lib/param: Merge "Logon Options" section from source3/param
via b727e70 lib/param: Merge "Browse Options" section from source3/param
via 3f1dfdd lib/param: Merge "WINS Options" section from source3/param
via ebc2cc7 lib/param: Merge "Locking Options" section from
source3/param
via 3e9c001 lib/param: Merge "Ldap Options" section from source3/param
via 8d2ba95 lib/param: Merge "EventLog Options" section from
source3/param
via a0e08ac lib/param: Merge "Miscellaneous Options" section from
source3/param
from a67daa3 s3:smb2_negprot: return the current system time in the SMB2
NEGPROT response
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 115a88e18f103e2191bba7ce30604086b619081b
Author: Andrew Bartlett <[email protected]>
Date: Thu Jul 26 16:32:11 2012 +1000
lib/param: Merge "Filename Handling" section from 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
Autobuild-User(master): Andrew Bartlett <[email protected]>
Autobuild-Date(master): Thu Jul 26 14:16:02 CEST 2012 on sn-devel-104
commit deb9a05a590245f632ac792f9960e220f4ed1a4f
Author: Andrew Bartlett <[email protected]>
Date: Thu Jul 26 16:28:51 2012 +1000
lib/param: Merge "Domain 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 <[email protected]>
Andrew Bartlett
commit 932f0a6af47bf5eec44c80b858598ba9ed69b8e2
Author: Andrew Bartlett <[email protected]>
Date: Thu Jul 26 16:25:29 2012 +1000
lib/param: Merge "Logon 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 <[email protected]>
Andrew Bartlett
commit b727e706c3992a881eef225bdd032a8cb699b8d4
Author: Andrew Bartlett <[email protected]>
Date: Thu Jul 26 16:03:09 2012 +1000
lib/param: Merge "Browse 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 <[email protected]>
Andrew Bartlett
commit 3f1dfdd8b4f7ccfb16d30b46f917f22523d4bec6
Author: Andrew Bartlett <[email protected]>
Date: Thu Jul 26 16:00:40 2012 +1000
lib/param: Merge "WINS 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 <[email protected]>
Andrew Bartlett
commit ebc2cc7f8a596f1ca63f263c33537ebe7726e20d
Author: Andrew Bartlett <[email protected]>
Date: Thu Jul 26 15:58:54 2012 +1000
lib/param: Merge "Locking 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 <[email protected]>
Andrew Bartlett
commit 3e9c00112e129d7a6251b190345090b86723b249
Author: Andrew Bartlett <[email protected]>
Date: Thu Jul 26 15:56:15 2012 +1000
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 <[email protected]>
Andrew Bartlett
commit 8d2ba95c90794e4ea0f2fa9a4c36223cf1aa25ea
Author: Andrew Bartlett <[email protected]>
Date: Thu Jul 26 15:54:25 2012 +1000
lib/param: Merge "EventLog 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 <[email protected]>
Andrew Bartlett
commit a0e08acbe04ac519f129e6934a44af739067bdfa
Author: Andrew Bartlett <[email protected]>
Date: Tue Jul 24 09:44:03 2012 +1000
lib/param: Merge "Miscellaneous 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 <[email protected]>
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
lib/param/loadparm.c | 1311 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 1264 insertions(+), 47 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index a5fa3c9..c211875 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -76,6 +76,13 @@ static bool defaults_saved = false;
#define LOADPARM_EXTRA_GLOBALS \
struct parmlist_entry *param_opt; \
char *szRealm; \
+ char *szConfigFile; \
+ int iPreferredMaster; \
+ char *szLdapMachineSuffix; \
+ char *szLdapUserSuffix; \
+ char *szLdapIdmapSuffix; \
+ char *szLdapGroupSuffix; \
+ char *szUsershareTemplateShare; \
char *szIdmapUID; \
char *szIdmapGID; \
int winbindMaxDomainConnections; \
@@ -85,8 +92,7 @@ static bool defaults_saved = false;
char *tls_crlfile; \
char *tls_dhpfile; \
char *loglevel; \
- char *panic_action; \
- int bPreferredMaster;
+ char *panic_action;
#include "lib/param/param_global.h"
@@ -138,22 +144,6 @@ static struct parm_struct parm_table[] = {
.enum_list = enum_server_role
},
{
- .label = "domain logons",
- .type = P_ENUM,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bDomainLogons),
- .special = NULL,
- .enum_list = enum_bool_auto
- },
- {
- .label = "domain master",
- .type = P_ENUM,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(domain_master),
- .special = NULL,
- .enum_list = enum_bool_auto
- },
- {
.label = "dos charset",
.type = P_STRING,
.p_class = P_GLOBAL,
@@ -834,21 +824,152 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_HIDE,
},
+ {N_("Filename Handling"), P_SEP, P_SEPARATOR},
+
{
- .label = "map system",
+ .label = "mangling method",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szManglingMethod),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "mangle prefix",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(mangle_prefix),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+
+ {
+ .label = "default case",
+ .type = P_ENUM,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(iDefaultCase),
+ .special = NULL,
+ .enum_list = enum_case,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
+ },
+ {
+ .label = "case sensitive",
+ .type = P_ENUM,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(iCaseSensitive),
+ .special = NULL,
+ .enum_list = enum_bool_auto,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "casesignames",
+ .type = P_ENUM,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(iCaseSensitive),
+ .special = NULL,
+ .enum_list = enum_bool_auto,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL |
FLAG_HIDE,
+ },
+ {
+ .label = "preserve case",
.type = P_BOOL,
.p_class = P_LOCAL,
- .offset = LOCAL_VAR(bMap_system),
+ .offset = LOCAL_VAR(bCasePreserve),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
- .label = "map hidden",
+ .label = "short preserve case",
.type = P_BOOL,
.p_class = P_LOCAL,
- .offset = LOCAL_VAR(bMap_hidden),
+ .offset = LOCAL_VAR(bShortCasePreserve),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "mangling char",
+ .type = P_CHAR,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(magic_char),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "hide dot files",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bHideDotFiles),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "hide special files",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bHideSpecialFiles),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "hide unreadable",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bHideUnReadable),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "hide unwriteable files",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bHideUnWriteableFiles),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "delete veto files",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bDeleteVetoFiles),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "veto files",
+ .type = P_STRING,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(szVetoFiles),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "hide files",
+ .type = P_STRING,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(szHideFiles),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "veto oplock files",
+ .type = P_STRING,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(szVetoOplockFiles),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
.label = "map archive",
@@ -856,14 +977,315 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(bMap_archive),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "map hidden",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bMap_hidden),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "map system",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bMap_system),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "map readonly",
+ .type = P_ENUM,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(iMap_readonly),
+ .special = NULL,
+ .enum_list = enum_map_readonly,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "mangled names",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bMangledNames),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "max stat cache size",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(iMaxStatCacheSize),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "stat cache",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(bStatCache),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "store dos attributes",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bStoreDosAttributes),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "dmapi support",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bDmapiSupport),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+
+
+ {N_("Domain Options"), P_SEP, P_SEPARATOR},
+
+ {
+ .label = "machine password timeout",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(machine_password_timeout),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_WIZARD,
+ },
+
+ {N_("Logon Options"), P_SEP, P_SEPARATOR},
+
+ {
+ .label = "add user script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szAddUserScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "rename user script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szRenameUserScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "delete user script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szDelUserScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "add group script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szAddGroupScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "delete group script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szDelGroupScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "add user to group script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szAddUserToGroupScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "delete user from group script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szDelUserFromGroupScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "set primary group script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szSetPrimaryGroupScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "add machine script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szAddMachineScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "shutdown script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szShutdownScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "abort shutdown script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szAbortShutdownScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "username map script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szUsernameMapScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "username map cache time",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(iUsernameMapCacheTime),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "logon script",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szLogonScript),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "logon path",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szLogonPath),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "logon drive",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szLogonDrive),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "logon home",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szLogonHome),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "domain logons",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(bDomainLogons),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+
+ {
+ .label = "init logon delayed hosts",
+ .type = P_LIST,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szInitLogonDelayedHosts),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
+ .label = "init logon delay",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(InitLogonDelay),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+
+ },
+
+ {N_("Browse Options"), P_SEP, P_SEPARATOR},
+
+ {
+ .label = "os level",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(os_level),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED,
--
Samba Shared Repository
