[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Apr 16 01:39:03 MDT 2012
The branch, master has been updated
via f35d201 Add an option to have s3fs as file server for samba4
via 4d872ff param: leave realm as a normal string, handle upper/lower case in handle_realm
via db44f35f param: harmonise wins parameters
via 2bc8999 lib/param: swap preferred name for 'lock dir' to match s3
via 3bb7cbf param: Merge common param elements by adding .flags
via 2b34812 s3-param: make FN_GLOBAL macros consistent, add lp_ using the macro
via 0eacc47 param: Change from _lp to lp__ as the prefix for internal parameter wrappers
via cf28df1 make _lp_readraw() and _lp_writeraw() static
via acb6447 param: harmonsise logfile parameter
via fed2380 param: Merge common param elements by adding .flags
from 06a0101 s4-provision: Update configuration lines for dlz_bind9
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f35d20119a3a6992cb3a9be047dbd723470d4b86
Author: Matthieu Patou <mat at matws.net>
Date: Mon Apr 9 02:09:22 2012 -0700
Add an option to have s3fs as file server for samba4
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Mon Apr 16 09:38:18 CEST 2012 on sn-devel-104
commit 4d872ff77f95b0aa48063d04cbc18e56f056bfc9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 12 18:02:11 2012 +1000
param: leave realm as a normal string, handle upper/lower case in handle_realm
This matches the behaviour of lib/param.
Andrew Bartlett
commit db44f35fc380e68cf3aa8d10c0851f7ce2d13ad1
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 12 17:47:08 2012 +1000
param: harmonise wins parameters
commit 2bc8999266629c73be22633c6188cc439a0ea2f4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 12 17:39:24 2012 +1000
lib/param: swap preferred name for 'lock dir' to match s3
commit 3bb7cbf79834aaf43b07385b39ecead61769a458
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 12 17:37:19 2012 +1000
param: Merge common param elements by adding .flags
This removes the difference between many of the key elements of the global
parameters table, and makes it easier to merge the two tables.
Andrew Bartlett
commit 2b348123a7ffaf1262cd08ce95bedab4b9047a27
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 12 17:10:36 2012 +1000
s3-param: make FN_GLOBAL macros consistent, add lp_ using the macro
This will make it easier to share the parameter tables between this
and lib/param.
Andrew Bartlett
commit 0eacc476229e9d6c5926096b73546b5363cd9d60
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 12 17:03:38 2012 +1000
param: Change from _lp to lp__ as the prefix for internal parameter wrappers
This will make a merge with the lib/param param code easier, as we can then paste lp_ to the front of
all parameters unconditionally.
Andrew Bartlett
commit cf28df1d9005ce15bc28615da4a9de0cd39c5573
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 12 16:58:40 2012 +1000
make _lp_readraw() and _lp_writeraw() static
commit acb64471b376e55e7a51355d0ce5e8a041719ba6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 12 16:51:54 2012 +1000
param: harmonsise logfile parameter
commit fed2380ac5051d739ea0f322381f187244a8bc49
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 12 16:29:21 2012 +1000
param: Merge common param elements by adding .flags
This removes the difference between many of the key elements of the global
parameters table, and makes it easier to merge the two tables.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
lib/param/loadparm.c | 194 +++++---
source3/include/proto.h | 4 +-
source3/param/loadparm.c | 522 ++++++++++----------
source3/rpc_server/rpc_service_setup.c | 2 +-
source3/services/svc_spoolss.c | 2 +-
source3/smbd/server.c | 4 +-
.../scripting/python/samba/provision/__init__.py | 27 +-
source4/setup/provision | 3 +-
8 files changed, 413 insertions(+), 345 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index e3792b6..46bae44 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -165,7 +165,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(comment),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT
},
{
.label = "path",
@@ -173,7 +174,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(szPath),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "directory",
@@ -181,7 +183,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(szPath),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_HIDE,
},
{
.label = "workgroup",
@@ -189,7 +192,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szWorkgroup),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "realm",
@@ -197,7 +201,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szRealm),
.special = handle_realm,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "netbios name",
@@ -205,7 +210,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szNetbiosName),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "netbios aliases",
@@ -221,7 +227,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szNetbiosScope),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "server string",
@@ -229,7 +236,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szServerString),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED,
},
{
.label = "interfaces",
@@ -237,7 +245,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szInterfaces),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "bind interfaces only",
@@ -245,7 +254,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bBindInterfacesOnly),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_WIZARD,
},
{
.label = "ntvfs handler",
@@ -310,7 +320,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bNullPasswords),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
},
{
.label = "obey pam restrictions",
@@ -318,7 +329,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bObeyPamRestrictions),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "password server",
@@ -358,7 +370,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bLanmanAuth),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "ntlm auth",
@@ -366,7 +379,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bNTLMAuth),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "client NTLMv2 auth",
@@ -374,7 +388,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bClientNTLMv2Auth),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "client lanman auth",
@@ -382,7 +397,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bClientLanManAuth),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "client plaintext auth",
@@ -390,7 +406,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bClientPlaintextAuth),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "client use spnego principal",
@@ -482,7 +499,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(logfile),
.special = handle_logfile,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
@@ -595,7 +613,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bLargeReadwrite),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "server max protocol",
@@ -619,7 +638,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(srv_maxprotocol),
.special = NULL,
- .enum_list = enum_protocol
+ .enum_list = enum_protocol,
+ .flags = FLAG_ADVANCED,
},
{
.label = "server min protocol",
@@ -701,7 +721,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(max_mux),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "max xmit",
@@ -709,7 +730,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(max_xmit),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
@@ -726,7 +748,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(max_wins_ttl),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "min wins ttl",
@@ -734,7 +757,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(min_wins_ttl),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "time server",
@@ -742,7 +766,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bTimeServer),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "unix extensions",
@@ -750,7 +775,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bUnixExtensions),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "use spnego",
@@ -766,7 +792,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(server_signing),
.special = NULL,
- .enum_list = enum_smb_signing_vals
+ .enum_list = enum_smb_signing_vals,
+ .flags = FLAG_ADVANCED,
},
{
.label = "client signing",
@@ -791,7 +818,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(iMaxConnections),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "paranoid server security",
@@ -867,7 +895,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(szPrintername),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "printer",
@@ -875,7 +904,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(szPrintername),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_HIDE,
},
{
@@ -909,7 +939,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bPreferredMaster),
.special = NULL,
- .enum_list = enum_bool_auto
+ .enum_list = enum_bool_auto,
+ .flags = FLAG_BASIC | FLAG_ADVANCED,
},
{
.label = "prefered master",
@@ -917,7 +948,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bPreferredMaster),
.special = NULL,
- .enum_list = enum_bool_auto
+ .enum_list = enum_bool_auto,
+ .flags = FLAG_HIDE,
},
{
.label = "local master",
@@ -933,7 +965,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(bBrowseable),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
},
{
.label = "browsable",
@@ -945,26 +978,26 @@ static struct parm_struct parm_table[] = {
},
{
- .label = "wins server",
- .type = P_LIST,
+ .label = "dns proxy",
+ .type = P_BOOL,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szWINSservers),
+ .offset = GLOBAL_VAR(bWINSdnsProxy),
.special = NULL,
.enum_list = NULL
},
{
- .label = "wins support",
- .type = P_BOOL,
+ .label = "wins server",
+ .type = P_LIST,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bWINSsupport),
+ .offset = GLOBAL_VAR(szWINSservers),
.special = NULL,
.enum_list = NULL
},
{
- .label = "dns proxy",
+ .label = "wins support",
.type = P_BOOL,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bWINSdnsProxy),
+ .offset = GLOBAL_VAR(bWINSsupport),
.special = NULL,
.enum_list = NULL
},
@@ -974,7 +1007,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szWINSHook),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
@@ -983,7 +1017,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(iCSCPolicy),
.special = NULL,
- .enum_list = enum_csc_policy
+ .enum_list = enum_csc_policy,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
},
{
@@ -1017,7 +1052,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szAutoServices),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "auto services",
@@ -1025,23 +1061,26 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szAutoServices),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
- .label = "lock dir",
+ .label = "lock directory",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szLockDir),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
- .label = "lock directory",
+ .label = "lock dir",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szLockDir),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_HIDE,
},
{
.label = "state directory",
@@ -1049,7 +1088,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szStateDir),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "cache directory",
@@ -1057,7 +1097,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szCacheDir),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "pid directory",
@@ -1082,7 +1123,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(szCopy),
.special = handle_copy,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_HIDE,
},
{
.label = "include",
@@ -1107,7 +1149,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_LOCAL,
.offset = LOCAL_VAR(volume),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "fstype",
@@ -1141,7 +1184,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bHostMSDfs),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "winbind separator",
@@ -1157,7 +1201,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szWinbinddSocketDirectory),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
.label = "winbindd privileged socket directory",
@@ -1165,7 +1210,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szWinbinddPrivilegedSocketDirectory),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
--
Samba Shared Repository
More information about the samba-cvs
mailing list