[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-1375-gb1829da
Andrew Bartlett
abartlet at samba.org
Thu Mar 27 23:39:30 GMT 2008
The branch, v4-0-test has been updated
via b1829da8f75175fcc569a3a9195f2358731055a9 (commit)
via 59d8d17093efac3a177a032f2e121ea6f43a96c8 (commit)
via 5a740f4daa79cf1b5fc9f24e424ae50e10932f4b (commit)
via 08ec91958d5d773dfc805869685094da749470e8 (commit)
via 2c18482b1983b4e2764beccc20f08e9b3074816a (commit)
via 4e4152dfd70145a7a00bc42effcd07b607204926 (commit)
via 7c7a1a2b1f69cb4623c8832b732e8a1343ebd109 (commit)
via f2c65f9907760b8852b70c53637388f08751ba88 (commit)
from f47df5761571dd5c36789fb2e225a1125ca0e8f7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit b1829da8f75175fcc569a3a9195f2358731055a9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Mar 28 10:38:12 2008 +1100
Don't specify what should be a default option in the generated smb.conf
Instead, sub in "", so that the default continued to come from the code.
Andrew Bartlett
commit 59d8d17093efac3a177a032f2e121ea6f43a96c8
Merge: 5a740f4daa79cf1b5fc9f24e424ae50e10932f4b f47df5761571dd5c36789fb2e225a1125ca0e8f7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Mar 28 10:19:21 2008 +1100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
commit 5a740f4daa79cf1b5fc9f24e424ae50e10932f4b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Mar 28 10:18:06 2008 +1100
Fix 'oplocks' in loadparm.
I forgot one more place where I must specify the new config option. I
wish this was more templated...
Andrew Bartlett
commit 08ec91958d5d773dfc805869685094da749470e8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 27 21:00:04 2008 +1100
Fix how we initialise the oplocks parameter.
Andrew Bartlett
commit 2c18482b1983b4e2764beccc20f08e9b3074816a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 27 20:50:39 2008 +1100
Actually call into lp_oplocks() in share_classic backend.
Andrew Bartlett
commit 4e4152dfd70145a7a00bc42effcd07b607204926
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 27 20:40:40 2008 +1100
Fix references to ntvfs share config
Andrew Bartlett
commit 7c7a1a2b1f69cb4623c8832b732e8a1343ebd109
Merge: f2c65f9907760b8852b70c53637388f08751ba88 9342c4f5ff2be16c9771fd07fbec87076af2e681
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 27 20:38:36 2008 +1100
Merge with metze's change for oplocks to be on by default
Andrew Bartlett
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
Conflicts:
source/ntvfs/common/opendb_tdb.c
commit f2c65f9907760b8852b70c53637388f08751ba88
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 27 20:32:02 2008 +1100
Make oplocks a per-share option.
This even goes via the share options system (a very odd layer of indirection).
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source/cluster/ctdb/opendb_ctdb.c | 2 +-
source/ntvfs/common/opendb_tdb.c | 3 +--
source/param/loadparm.c | 6 +++++-
source/param/share.h | 2 ++
source/param/share_classic.c | 4 ++++
source/scripting/python/samba/provision.py | 4 ++--
6 files changed, 15 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/cluster/ctdb/opendb_ctdb.c b/source/cluster/ctdb/opendb_ctdb.c
index 402f3a2..ed09cf0 100644
--- a/source/cluster/ctdb/opendb_ctdb.c
+++ b/source/cluster/ctdb/opendb_ctdb.c
@@ -97,7 +97,7 @@ static struct odb_context *odb_ctdb_init(TALLOC_CTX *mem_ctx,
odb->ntvfs_ctx = ntvfs_ctx;
/* leave oplocks disabled by default until the code is working */
- odb->oplocks = lp_parm_bool(ntvfs_ctx->lp_ctx, NULL, "opendb", "oplocks", false);
+ odb->oplocks = share_bool_option(ntvfs_ctx->config, SHARE_OPLOCKS, SHARE_OPLOCKS_DEFAULT);
return odb;
}
diff --git a/source/ntvfs/common/opendb_tdb.c b/source/ntvfs/common/opendb_tdb.c
index fc05b34..99c0a95 100644
--- a/source/ntvfs/common/opendb_tdb.c
+++ b/source/ntvfs/common/opendb_tdb.c
@@ -101,8 +101,7 @@ static struct odb_context *odb_tdb_init(TALLOC_CTX *mem_ctx,
odb->ntvfs_ctx = ntvfs_ctx;
- /* leave oplocks disabled by default until the code is working */
- odb->oplocks = lp_parm_bool(ntvfs_ctx->lp_ctx, NULL, "opendb", "oplocks", true);
+ odb->oplocks = share_bool_option(ntvfs_ctx->config, SHARE_OPLOCKS, SHARE_OPLOCKS_DEFAULT);
odb->lease_ctx = sys_lease_context_create(ntvfs_ctx->config, odb,
ntvfs_ctx->event_ctx,
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index a1d29b0..812162e 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -210,6 +210,7 @@ struct loadparm_service
int bMap_hidden;
int bMap_archive;
int bStrictLocking;
+ int bOplocks;
int iCreate_mask;
int iCreate_force_mode;
int iDir_mask;
@@ -457,6 +458,7 @@ static struct parm_struct parm_table[] = {
{"csc policy", P_ENUM, P_LOCAL, LOCAL_VAR(iCSCPolicy), NULL, enum_csc_policy},
{"strict locking", P_BOOL, P_LOCAL, LOCAL_VAR(bStrictLocking), NULL, NULL},
+ {"oplocks", P_BOOL, P_LOCAL, LOCAL_VAR(bOplocks), NULL, NULL},
{"share backend", P_STRING, P_GLOBAL, GLOBAL_VAR(szShareBackend), NULL, NULL},
{"preload", P_STRING, P_GLOBAL, GLOBAL_VAR(szAutoServices), NULL, NULL},
@@ -715,6 +717,7 @@ _PUBLIC_ FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
_PUBLIC_ FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden)
_PUBLIC_ FN_LOCAL_BOOL(lp_map_archive, bMap_archive)
_PUBLIC_ FN_LOCAL_BOOL(lp_strict_locking, bStrictLocking)
+_PUBLIC_ FN_LOCAL_BOOL(lp_oplocks, bOplocks)
_PUBLIC_ FN_LOCAL_BOOL(lp_strict_sync, bStrictSync)
_PUBLIC_ FN_LOCAL_BOOL(lp_ci_filesystem, bCIFileSystem)
_PUBLIC_ FN_LOCAL_BOOL(lp_map_system, bMap_system)
@@ -2250,6 +2253,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lp_ctx->sDefault->bRead_only = true;
lp_ctx->sDefault->bMap_archive = true;
lp_ctx->sDefault->bStrictLocking = true;
+ lp_ctx->sDefault->bOplocks = true;
lp_ctx->sDefault->iCreate_mask = 0744;
lp_ctx->sDefault->iCreate_force_mode = 0000;
lp_ctx->sDefault->iDir_mask = 0755;
@@ -2292,7 +2296,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lp_do_global_parameter(lp_ctx, "max connections", "-1");
lp_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup unixinfo");
- lp_do_global_parameter(lp_ctx, "server services", "smb rpc nbt wrepl ldap cldap web kdc drepl winbind");
+ lp_do_global_parameter(lp_ctx, "server services", "smb rpc nbt wrepl ldap cldap kdc drepl winbind");
lp_do_global_parameter(lp_ctx, "ntptr providor", "simple_ldb");
lp_do_global_parameter(lp_ctx, "auth methods:domain controller", "anonymous sam_ignoredomain");
lp_do_global_parameter(lp_ctx, "auth methods:member server", "anonymous sam winbind");
diff --git a/source/param/share.h b/source/param/share.h
index 51f4578..9f9cbdc 100644
--- a/source/param/share.h
+++ b/source/param/share.h
@@ -90,6 +90,7 @@ struct loadparm_context;
#define SHARE_MAP_ARCHIVE "map-archive"
#define SHARE_STRICT_LOCKING "strict-locking"
+#define SHARE_OPLOCKS "oplocks"
#define SHARE_STRICT_SYNC "strict-sync"
#define SHARE_MSDFS_ROOT "msdfs-root"
#define SHARE_CI_FILESYSTEM "ci-filesystem"
@@ -125,6 +126,7 @@ struct loadparm_context;
#define SHARE_MAP_ARCHIVE_DEFAULT true
#define SHARE_STRICT_LOCKING_DEFAULT true
+#define SHARE_OPLOCKS_DEFAULT true
#define SHARE_STRICT_SYNC_DEFAULT false
#define SHARE_MSDFS_ROOT_DEFAULT false
#define SHARE_CI_FILESYSTEM_DEFAULT false
diff --git a/source/param/share_classic.c b/source/param/share_classic.c
index f5a6fa6..c3adc44 100644
--- a/source/param/share_classic.c
+++ b/source/param/share_classic.c
@@ -213,6 +213,10 @@ static bool sclassic_bool_option(struct share_config *scfg, const char *opt_name
return lp_strict_locking(s, lp_default_service(lp_ctx));
}
+ if (strcmp(opt_name, SHARE_OPLOCKS) == 0) {
+ return lp_oplocks(s, lp_default_service(lp_ctx));
+ }
+
if (strcmp(opt_name, SHARE_STRICT_SYNC) == 0) {
return lp_strict_sync(s, lp_default_service(lp_ctx));
}
diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index e97ce69..d5e66d8 100644
--- a/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@ -374,8 +374,8 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
default_lp.set("lock dir", os.path.abspath(targetdir))
else:
- privatedir_line = "private_dir = " + default_lp.get("private dir")
- lockdir_line = "lock dir = " + default_lp.get("lock dir")
+ privatedir_line = ""
+ lockdir_line = ""
sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
netlogon = os.path.join(sysvol, realm.lower(), "scripts")
--
Samba Shared Repository
More information about the samba-cvs
mailing list