[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-1069-ge185fd4
Michael Adam
obnox at samba.org
Tue Apr 22 14:33:08 GMT 2008
The branch, v3-2-test has been updated
via e185fd493558a40a4ad5261525b3f9515803bf59 (commit)
via d9b48d728d130f17a8270821d66092d6098449f3 (commit)
via b44f45f4f4ca2171dd6f8a72c91cd3574acda5c5 (commit)
via 1036f5a2e7de0254288cf5068ec1eab50ef19939 (commit)
via 54c0461679642b38653f803e7b21d865472f3f91 (commit)
via 640b8ae7ad7aa53e05c7124fed072f2312aa91aa (commit)
via 3d1da73f66b8452693262e2d03f986eec438451d (commit)
via dd9fe5aec43e60d554f2580a0699fe6e4cfb5d3c (commit)
from 5df75578ef1da41164936cd11b14114889201d47 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit e185fd493558a40a4ad5261525b3f9515803bf59
Author: Michael Adam <obnox at samba.org>
Date: Tue Apr 22 16:10:59 2008 +0200
WHATSNEW: update the section on registry configuration.
Michael
commit d9b48d728d130f17a8270821d66092d6098449f3
Author: Michael Adam <obnox at samba.org>
Date: Tue Apr 22 16:03:35 2008 +0200
WHATSNEW: list special meaning of "include = registry" under smb.conf changes.
Michael
commit b44f45f4f4ca2171dd6f8a72c91cd3574acda5c5
Author: Michael Adam <obnox at samba.org>
Date: Tue Apr 22 15:53:40 2008 +0200
WHATSNEW: re-establish alphabetic ordering in smb.conf changes
Michael
commit 1036f5a2e7de0254288cf5068ec1eab50ef19939
Author: Michael Adam <obnox at samba.org>
Date: Tue Apr 22 15:41:48 2008 +0200
WHATSNEW: update my changes for 3.2.0pre3
Michael
commit 54c0461679642b38653f803e7b21d865472f3f91
Author: Michael Adam <obnox at samba.org>
Date: Tue Apr 22 16:13:29 2008 +0200
libsmbconf: fix comment headers in smbconf.h
Michael
commit 640b8ae7ad7aa53e05c7124fed072f2312aa91aa
Author: Michael Adam <obnox at samba.org>
Date: Tue Apr 22 15:51:36 2008 +0200
libsmbconf: text backend remove comment references to "simple".
Michael
commit 3d1da73f66b8452693262e2d03f986eec438451d
Author: Michael Adam <obnox at samba.org>
Date: Tue Apr 22 15:50:42 2008 +0200
libsmbconf: rename smbconf_init_txt_simple() to smbconf_init_txt().
...for consistency.
Michael
commit dd9fe5aec43e60d554f2580a0699fe6e4cfb5d3c
Author: Michael Adam <obnox at samba.org>
Date: Tue Apr 22 15:28:58 2008 +0200
libsmbconf: rename text backend smbconf_txt_simple to smbconf_txt.
Michael
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 30 +++++++++++++++++--
source/Makefile.in | 2 +-
source/lib/smbconf/smbconf.h | 17 +++++++----
source/lib/smbconf/smbconf_init.c | 4 +-
.../{smbconf_txt_simple.c => smbconf_txt.c} | 10 +++---
source/lib/smbconf/testsuite.c | 2 +-
6 files changed, 46 insertions(+), 19 deletions(-)
rename source/lib/smbconf/{smbconf_txt_simple.c => smbconf_txt.c} (98%)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 364b3fe..231c16d 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -88,9 +88,18 @@ Registry Configuration Backend
==============================
Samba is now able to use a registry based configuration backed to
-supplement smb.conf setting. This feature may be enabled by setting
-"config backend = registry" and "registry shares = yes" in the [global]
-section of smb.conf and may be managed using the "net conf" command.
+supplement smb.conf settings. This feature may be enabled by setting
+"config backend = registry" in the [global] section of smb.conf for a
+registry only configuration, or by specifying "include = registry" to
+include global options from registry for a mixed setup.
+
+The new parameter "registry shares = yes" in the [global] section of
+smb.conf can be used to activate share definitions from registry.
+These shares are loaded on demand by the server. Registry shares are
+automatically activated by the global registry options above.
+
+The configuration stored in registry can be conveniently managed using
+the "net conf" command.
More information may be obtained from the smb.conf(5) and net(8) man
pages.
@@ -175,6 +184,7 @@ smb.conf changes
Parameter Name Description Default
-------------- ----------- -------
+ administrative share New No
client lanman auth Changed Default No
client ldap sasl wrapping New plain
client plaintext auth Changed Default No
@@ -183,7 +193,6 @@ smb.conf changes
config backend New file
ctdb socket New ""
debug class New No
- administrative share New No
lanman auth Changed Default No
ldap debug level New 0
ldap debug threshold New 10
@@ -195,6 +204,8 @@ smb.conf changes
winbind expand groups New 1
winbind rpc only New No
+ New special meaning of "include = registry".
+
Changes since 3.2.0pre2:
-----------------------
@@ -209,6 +220,7 @@ o Michael Adam <obnox at samba.org>
* Fix %I macro expansion for IPv4 mapped IPv6 addresses.
* Convert registry.tdb to use dbwrap and fix memleaks.
* Several make test fixes and improvements.
+ * Several libreplace extensions and fixes (portet from v4-0-test).
* Rename libnet_conf to libsmbconf and introduce backend abstraction layer.
* Add text backend to libsmbconf, based on params.c.
* Fix handling of includes in registry libsmbconf backend.
@@ -216,6 +228,16 @@ o Michael Adam <obnox at samba.org>
* Add a "net registry" command to locally access the registry.
* Add testsuites for libsmbconf and "net registry".
* Fix Coverity IDs 517, 536, 545.
+ * Remove unneeded REGISTRY_HOOKS layer from reghook cache
+ to allow plugging one backend to multiple keys more easily.
+ * Add smbconf_init dispatcher taking source strings like "backend:path"
+ * Fix handling of dangling parameters (without share) in libsmbconf.
+ * Introduce special meaning of "include = registry" to complement
+ the registry-only configuration of "config backend = registry".
+ * Enhance error propagation by making several registry functions
+ return WERROR.
+ * Fix loading of registry shares in smbd by fixing the token.
+ * Fix a segfault in tdb_wrap_log().
o Jeremy Allison <jra at samba.org>
diff --git a/source/Makefile.in b/source/Makefile.in
index 27b562c..f438fbd 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -853,7 +853,7 @@ LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
LIBSMBCONF_OBJ = lib/smbconf/smbconf.o lib/smbconf/smbconf_util.o \
lib/smbconf/smbconf_reg.o \
- lib/smbconf/smbconf_txt_simple.o \
+ lib/smbconf/smbconf_txt.o \
lib/smbconf/smbconf_init.o
SMBCONFTORT_OBJ0 = lib/smbconf/testsuite.o
diff --git a/source/lib/smbconf/smbconf.h b/source/lib/smbconf/smbconf.h
index 481c2b1..589d14e 100644
--- a/source/lib/smbconf/smbconf.h
+++ b/source/lib/smbconf/smbconf.h
@@ -27,19 +27,24 @@ struct smbconf_csn {
uint64_t csn;
};
-/*
- * initialization functions for the available modules
- */
+/**
+ * intialization dispatcher function.
+ * takes source string in the form of "backend:path"
+ */
WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
const char *source);
+/**
+ * initialization functions for the available modules
+ */
+
WERROR smbconf_init_reg(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
const char *path);
-WERROR smbconf_init_txt_simple(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx **conf_ctx,
- const char *path);
+WERROR smbconf_init_txt(TALLOC_CTX *mem_ctx,
+ struct smbconf_ctx **conf_ctx,
+ const char *path);
/*
* the smbconf API functions
diff --git a/source/lib/smbconf/smbconf_init.c b/source/lib/smbconf/smbconf_init.c
index 2ad3a08..4efc440 100644
--- a/source/lib/smbconf/smbconf_init.c
+++ b/source/lib/smbconf/smbconf_init.c
@@ -71,14 +71,14 @@ WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
if (strequal(backend, "registry") || strequal(backend, "reg")) {
werr = smbconf_init_reg(mem_ctx, conf_ctx, path);
} else if (strequal(backend, "file") || strequal(backend, "txt")) {
- werr = smbconf_init_txt_simple(mem_ctx, conf_ctx, path);
+ werr = smbconf_init_txt(mem_ctx, conf_ctx, path);
} else if (sep == NULL) {
/*
* If no separator was given in the source, and the string is
* not a know backend, assume file backend and use the source
* string as a path argument.
*/
- werr = smbconf_init_txt_simple(mem_ctx, conf_ctx, backend);
+ werr = smbconf_init_txt(mem_ctx, conf_ctx, backend);
} else {
/*
* Separator was specified but this is not a known backend.
diff --git a/source/lib/smbconf/smbconf_txt_simple.c b/source/lib/smbconf/smbconf_txt.c
similarity index 98%
rename from source/lib/smbconf/smbconf_txt_simple.c
rename to source/lib/smbconf/smbconf_txt.c
index d2dc24a..c511185 100644
--- a/source/lib/smbconf/smbconf_txt_simple.c
+++ b/source/lib/smbconf/smbconf_txt.c
@@ -1,6 +1,6 @@
/*
* Unix SMB/CIFS implementation.
- * libsmbconf - Samba configuration library, simple text backend
+ * libsmbconf - Samba configuration library, text backend
* Copyright (C) Michael Adam 2008
*
* This program is free software; you can redistribute it and/or modify
@@ -211,7 +211,7 @@ static WERROR smbconf_txt_load_file(struct smbconf_ctx *ctx)
/**********************************************************************
*
- * smbconf operations: simple text implementations
+ * smbconf operations: text backend implementations
*
**********************************************************************/
@@ -624,9 +624,9 @@ static struct smbconf_ops smbconf_ops_txt = {
* initialize the smbconf text backend
* the only function that is exported from this module
*/
-WERROR smbconf_init_txt_simple(TALLOC_CTX *mem_ctx,
- struct smbconf_ctx **conf_ctx,
- const char *path)
+WERROR smbconf_init_txt(TALLOC_CTX *mem_ctx,
+ struct smbconf_ctx **conf_ctx,
+ const char *path)
{
WERROR werr;
diff --git a/source/lib/smbconf/testsuite.c b/source/lib/smbconf/testsuite.c
index 6f7ce10..cffd239 100644
--- a/source/lib/smbconf/testsuite.c
+++ b/source/lib/smbconf/testsuite.c
@@ -183,7 +183,7 @@ static bool torture_smbconf_txt(void)
printf("test: text backend\n");
printf("test: init\n");
- werr = smbconf_init_txt_simple(mem_ctx, &conf_ctx, NULL);
+ werr = smbconf_init_txt(mem_ctx, &conf_ctx, NULL);
if (!W_ERROR_IS_OK(werr)) {
printf("failure: init failed: %s\n", dos_errstr(werr));
ret = false;
--
Samba Shared Repository
More information about the samba-cvs
mailing list