The branch, v3-2-stable has been updated
via 530cdc6c1baea789e2ecab226933b651eeb13681 (commit)
via b479a592b386128e6e2cf239833845545ead7602 (commit)
via 3afe7e92addb2a3770cf3bde3552c1fd632e2bdb (commit)
via 6e6cc9bd2035e1fcfb9193bfe63c2f441fc67c69 (commit)
via a8296be3db00ceaa29883a3109efc55ec654934e (commit)
via 99ba39839efd920e193e360c513338322028fb3a (commit)
via 6c0c3bd96fa62c7cb5d8ff8128f76c0b121eea0b (commit)
via 543fe0fa2b02178c489a1ca6958e6249d9099449 (commit)
via 2c6560503f5ebd40c2b8d0370e8a733d556be821 (commit)
from 83266da7908be25bf6bdf2cad10553b13417e5f2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 530cdc6c1baea789e2ecab226933b651eeb13681
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Tue Apr 22 15:59:38 2008 +0200
Make nsstest valgrind-clean: buf is referred to by the parsed grp struct
(cherry picked from commit 20ddbcaa0c113646cea774c36209f382cada50b0)
commit b479a592b386128e6e2cf239833845545ead7602
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Tue Apr 22 16:10:59 2008 +0200
WHATSNEW: update the section on registry configuration.
Michael
(cherry picked from commit e185fd493558a40a4ad5261525b3f9515803bf59)
commit 3afe7e92addb2a3770cf3bde3552c1fd632e2bdb
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Tue Apr 22 16:03:35 2008 +0200
WHATSNEW: list special meaning of "include = registry" under smb.conf
changes.
Michael
(cherry picked from commit d9b48d728d130f17a8270821d66092d6098449f3)
commit 6e6cc9bd2035e1fcfb9193bfe63c2f441fc67c69
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Tue Apr 22 15:53:40 2008 +0200
WHATSNEW: re-establish alphabetic ordering in smb.conf changes
Michael
(cherry picked from commit b44f45f4f4ca2171dd6f8a72c91cd3574acda5c5)
commit a8296be3db00ceaa29883a3109efc55ec654934e
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Tue Apr 22 15:41:48 2008 +0200
WHATSNEW: update my changes for 3.2.0pre3
Michael
(cherry picked from commit 1036f5a2e7de0254288cf5068ec1eab50ef19939)
commit 99ba39839efd920e193e360c513338322028fb3a
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Tue Apr 22 16:13:29 2008 +0200
libsmbconf: fix comment headers in smbconf.h
Michael
(cherry picked from commit 54c0461679642b38653f803e7b21d865472f3f91)
commit 6c0c3bd96fa62c7cb5d8ff8128f76c0b121eea0b
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Tue Apr 22 15:51:36 2008 +0200
libsmbconf: text backend remove comment references to "simple".
Michael
(cherry picked from commit 640b8ae7ad7aa53e05c7124fed072f2312aa91aa)
commit 543fe0fa2b02178c489a1ca6958e6249d9099449
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Tue Apr 22 15:50:42 2008 +0200
libsmbconf: rename smbconf_init_txt_simple() to smbconf_init_txt().
...for consistency.
Michael
(cherry picked from commit 3d1da73f66b8452693262e2d03f986eec438451d)
commit 2c6560503f5ebd40c2b8d0370e8a733d556be821
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Tue Apr 22 15:28:58 2008 +0200
libsmbconf: rename text backend smbconf_txt_simple to smbconf_txt.
Michael
(cherry picked from commit dd9fe5aec43e60d554f2580a0699fe6e4cfb5d3c)
-----------------------------------------------------------------------
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 +-
source/torture/nsstest.c | 3 --
7 files changed, 46 insertions(+), 22 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 a9bdf39..1bee07c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -85,9 +85,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.
@@ -172,6 +181,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
@@ -180,7 +190,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
@@ -192,6 +201,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:
-----------------------
@@ -206,6 +217,7 @@ o Michael Adam <[EMAIL PROTECTED]>
* 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.
@@ -213,6 +225,16 @@ o Michael Adam <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
diff --git a/source/Makefile.in b/source/Makefile.in
index 922dbfd..b697772 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -844,7 +844,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;
diff --git a/source/torture/nsstest.c b/source/torture/nsstest.c
index ca66226..6bd0efe 100644
--- a/source/torture/nsstest.c
+++ b/source/torture/nsstest.c
@@ -201,7 +201,6 @@ again:
SAFE_FREE(buf);
return NULL;
}
- SAFE_FREE(buf);
return &grp;
}
@@ -240,7 +239,6 @@ again:
SAFE_FREE(buf);
return NULL;
}
- SAFE_FREE(buf);
return &grp;
}
@@ -280,7 +278,6 @@ again:
SAFE_FREE(buf);
return NULL;
}
- SAFE_FREE(buf);
return &grp;
}
--
Samba Shared Repository
