[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ccaab14 ldb: make the 'spy' code more paranoid
via 8d9665d s4-services: disable the web server by default
via 4d6c120 ldb: fixed ldbsearch when no baseDN specified and cross-ncs
is used
via 8ab3c84 pyldb: added OID_COMPARATOR constants
via 7dba93a wintest: update snapshots
from 786fe9f Fix bug 8429 - Compound SMB2 requests on an IPC connection
can corrupt the reply stream.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ccaab14ac423025d1c3188c429832533f19479f1
Author: Andrew Tridgell tri...@samba.org
Date: Thu Sep 1 14:28:10 2011 +1000
ldb: make the 'spy' code more paranoid
the spy code in ldb_tdb was added a while ago to overcome a memory
hierarchy problem with async ldb errors. Recently we started to get
valgrind errors related to the order of free in the spy code. This
patch ensures that we don't try to use a freed spy pointer. This
prevents the valgrind errors, although I suspect that the memory
hierarchy we have here is more complex than it needs to be
Pair-Programmed-With: Andrew Bartlett abart...@samba.org
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Thu Sep 1 08:54:23 CEST 2011 on sn-devel-104
commit 8d9665d5d15954cd36d1c385384520ce15ab4857
Author: Andrew Tridgell tri...@samba.org
Date: Thu Sep 1 13:50:17 2011 +1000
s4-services: disable the web server by default
the web server is not being actively maintained, and is causing
problems with memory errors (as shown by valgrind). It is better to
disable this until it can get some TLC
Pair-Programmed-With: Andrew Bartlett abart...@samba.org
commit 4d6c120fb7a9aef80e83f00b155ff93e96034897
Author: Andrew Tridgell tri...@samba.org
Date: Wed Aug 31 16:17:54 2011 +1000
ldb: fixed ldbsearch when no baseDN specified and cross-ncs is used
Pair-Programmed-With: Andrew Bartlett abart...@samba.org
commit 8ab3c843b1bf0f60a7d6b68411931d204b6f882b
Author: Andrew Tridgell tri...@samba.org
Date: Wed Aug 31 15:55:27 2011 +1000
pyldb: added OID_COMPARATOR constants
This also changes the other constants to remove the LDB_ prefix, which
is redundent
Pair-Programmed-With: Andrew Bartlett abart...@samba.org
commit 7dba93ac4170bfb17bbd579fa9578391e07667f0
Author: Andrew Bartlett abart...@samba.org
Date: Tue Aug 30 09:02:01 2011 +1000
wintest: update snapshots
---
Summary of changes:
lib/ldb/ldb_tdb/ldb_tdb.c | 14 +++-
lib/ldb/ldb_tdb/ldb_tdb.h |8 ---
lib/ldb/pyldb.c | 20 ++
lib/ldb/tools/ldbsearch.c | 28 +++---
source4/param/loadparm.c|2 +-
source4/scripting/python/samba/dbchecker.py |2 +-
wintest/conf/abartlet.conf | 10
7 files changed, 54 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/ldb_tdb/ldb_tdb.c b/lib/ldb/ldb_tdb/ldb_tdb.c
index f07a9d2..3630a18 100644
--- a/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -52,6 +52,12 @@
#include ldb_tdb.h
#include lib/tdb_compat/tdb_compat.h
+/*
+ prevent memory errors on callbacks
+*/
+struct ltdb_req_spy {
+ struct ltdb_context *ctx;
+};
/*
map a tdb error code to a ldb error code
@@ -1221,9 +1227,10 @@ static void ltdb_timeout(struct tevent_context *ev,
ltdb_request_done(ctx, LDB_ERR_TIME_LIMIT_EXCEEDED);
}
- if (!ctx-request_terminated) {
+ if (ctx-spy) {
/* neutralize the spy */
ctx-spy-ctx = NULL;
+ ctx-spy = NULL;
}
talloc_free(ctx);
}
@@ -1318,9 +1325,10 @@ static void ltdb_callback(struct tevent_context *ev,
}
done:
- if (!ctx-request_terminated) {
+ if (ctx-spy) {
/* neutralize the spy */
ctx-spy-ctx = NULL;
+ ctx-spy = NULL;
}
talloc_free(ctx);
}
@@ -1330,7 +1338,9 @@ static int ltdb_request_destructor(void *ptr)
struct ltdb_req_spy *spy = talloc_get_type(ptr, struct ltdb_req_spy);
if (spy-ctx != NULL) {
+ spy-ctx-spy = NULL;
spy-ctx-request_terminated = true;
+ spy-ctx = NULL;
}
return 0;
diff --git a/lib/ldb/ldb_tdb/ldb_tdb.h b/lib/ldb/ldb_tdb/ldb_tdb.h
index 96ad43f..29856bf 100644
--- a/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -33,14 +33,6 @@ struct ltdb_private {
bool warn_unindexed;
};
-/*
- the async local context
- holds also internal search state during a full db search
-*/
-struct ltdb_req_spy {
- struct ltdb_context *ctx;
-};
-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6d8b4f5 s3-rpc_server: Add missing rng_fault_state in epmapper.
via ae292ed s3-rpc_server: Handle services with multiple pipe names.
from ccaab14 ldb: make the 'spy' code more paranoid
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6d8b4f59e41051bcdfc514cce59a4a286c480bda
Author: Andreas Schneider a...@samba.org
Date: Thu Sep 1 09:32:33 2011 +0200
s3-rpc_server: Add missing rng_fault_state in epmapper.
We need to raise an exception so we need to set the rng_fault_state for
epm_Insert and epm_Delete if someone connects over a transport other
than NCALRPC.
Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Thu Sep 1 15:59:50 CEST 2011 on sn-devel-104
commit ae292ed1806474fdbae1aef9776a933316e057bf
Author: Andreas Schneider a...@samba.org
Date: Wed Aug 31 16:46:35 2011 +0200
s3-rpc_server: Handle services with multiple pipe names.
The configuration should only use the default pipe name to configure all
of them correctly.
---
Summary of changes:
selftest/target/Samba3.pm |2 --
source3/rpc_server/epmapper/srv_epmapper.c |2 ++
source3/rpc_server/rpc_config.c| 12 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index d0ca0a1..a5c11d9 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -288,7 +288,6 @@ sub setup_plugin_s4_dc()
rpc_daemon:epmd = disabled
rpc_daemon:lsasd = disabled
rpc_server:tcpip = no
-rpc_server:lsass = external
rpc_server:lsarpc = external
rpc_server:netlogon = external
rpc_server:samr = external
@@ -905,7 +904,6 @@ sub provision($$$)
ncalrpc dir = $prefix_abs/ncalrpc
rpc_server:epmapper = external
rpc_server:spoolss = external
- rpc_server:lsass = external
rpc_server:lsarpc = external
rpc_server:samr = external
rpc_server:netlogon = external
diff --git a/source3/rpc_server/epmapper/srv_epmapper.c
b/source3/rpc_server/epmapper/srv_epmapper.c
index fa3177e..c492580 100644
--- a/source3/rpc_server/epmapper/srv_epmapper.c
+++ b/source3/rpc_server/epmapper/srv_epmapper.c
@@ -306,6 +306,7 @@ error_status_t _epm_Insert(struct pipes_struct *p,
/* If this is not a priviledged users, return */
if (p-transport != NCALRPC ||
!is_priviledged_pipe(p-session_info)) {
+ p-rng_fault_state = true;
return EPMAPPER_STATUS_CANT_PERFORM_OP;
}
@@ -442,6 +443,7 @@ error_status_t _epm_Delete(struct pipes_struct *p,
/* If this is not a priviledged users, return */
if (p-transport != NCALRPC ||
!is_priviledged_pipe(p-session_info)) {
+ p-rng_fault_state = true;
return EPMAPPER_STATUS_CANT_PERFORM_OP;
}
diff --git a/source3/rpc_server/rpc_config.c b/source3/rpc_server/rpc_config.c
index a1c639c..3ddc189 100644
--- a/source3/rpc_server/rpc_config.c
+++ b/source3/rpc_server/rpc_config.c
@@ -41,20 +41,28 @@ struct rpc_service_defaults {
enum rpc_service_mode_e rpc_service_mode(const char *name)
{
+ const char *pipe_name = name;
const char *rpcsrv_type;
enum rpc_service_mode_e state;
const char *def;
int i;
+ /* Handle pipes with multiple names */
+ if (strcmp(pipe_name, lsass) == 0) {
+ pipe_name = lsarpc;
+ } else if (strcmp(pipe_name, plugplay) == 0) {
+ pipe_name = ntsvcs;
+ }
+
def = embedded;
for (i = 0; rpc_service_defaults[i].name; i++) {
- if (strcasecmp_m(name, rpc_service_defaults[i].name) == 0) {
+ if (strcasecmp_m(pipe_name, rpc_service_defaults[i].name) == 0)
{
def = rpc_service_defaults[i].def_mode;
}
}
rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
- rpc_server, name, def);
+ rpc_server, pipe_name, def);
if (strcasecmp_m(rpcsrv_type, embedded) == 0) {
state = RPC_SERVICE_MODE_EMBEDDED;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1d4de78 Fix bug 8433, segfault in iconv.c
from 6d8b4f5 s3-rpc_server: Add missing rng_fault_state in epmapper.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1d4de78f567e908e0acc218630fceb0884b07d65
Author: Volker Lendecke v...@samba.org
Date: Thu Sep 1 16:55:03 2011 +0200
Fix bug 8433, segfault in iconv.c
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Thu Sep 1 18:25:34 CEST 2011 on sn-devel-104
---
Summary of changes:
lib/util/charset/iconv.c |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/charset/iconv.c b/lib/util/charset/iconv.c
index 64e345a..f63c4e6 100644
--- a/lib/util/charset/iconv.c
+++ b/lib/util/charset/iconv.c
@@ -97,7 +97,6 @@ static struct charset_functions *find_charset_functions(const
char *name)
if(strcasecmp(c-name, name) == 0) {
return c;
}
- c = c-next;
}
return NULL;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 7d2006c Fix bug 8433, segfault in iconv.c
from fc8c588 s3:smb2 fix Bug 8428 - wrong reply to DHnC (durable handle
reconnect)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 7d2006ccf58555e82bc957aa62beab6420fcbc48
Author: Volker Lendecke v...@samba.org
Date: Thu Sep 1 16:55:03 2011 +0200
Fix bug 8433, segfault in iconv.c
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Thu Sep 1 18:25:34 CEST 2011 on sn-devel-104
(cherry picked from commit 1d4de78f567e908e0acc218630fceb0884b07d65)
---
Summary of changes:
lib/util/charset/iconv.c |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/charset/iconv.c b/lib/util/charset/iconv.c
index cee2d26..1adeb52 100644
--- a/lib/util/charset/iconv.c
+++ b/lib/util/charset/iconv.c
@@ -96,7 +96,6 @@ static struct charset_functions *find_charset_functions(const
char *name)
if(strcasecmp(c-name, name) == 0) {
return c;
}
- c = c-next;
}
return NULL;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e579c84 s3:registry: implement regdb_set_secdesc() with
regdb_trans_do()
via 861f04b s3:registry: implement regdb_store_values() with
regdb_trans_do()
via 6832ae4 s3:registry: change regdb_store_values_internal() from bool
to NTSTATUS return code
via e1d7cfb s3:registry: use the regdb_trans_do wrapper instead of
using dbwrap_trans_do directly in the registry db code.
via 9352a95 s3:registry: add regdb_trans_do(): a transaction wrapper
that will check the regdb version
via 5ef1173 s3:registry: drop log level of unknown regdb version
message in regdb_init() to 0
from 1d4de78 Fix bug 8433, segfault in iconv.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e579c84b4fc28ccf95cc8e6cc53c6001f5494ec1
Author: Michael Adam ob...@samba.org
Date: Tue Aug 30 16:30:01 2011 +0200
s3:registry: implement regdb_set_secdesc() with regdb_trans_do()
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Fri Sep 2 00:51:40 CEST 2011 on sn-devel-104
commit 861f04bec0172b80d20773f9be882ce08f5e3784
Author: Michael Adam ob...@samba.org
Date: Tue Aug 30 14:06:22 2011 +0200
s3:registry: implement regdb_store_values() with regdb_trans_do()
This adds the runtime check for changed regdb format version to store_values
commit 6832ae4c6de815c326315de5b5e3a5a612d74af7
Author: Michael Adam ob...@samba.org
Date: Tue Aug 30 16:11:01 2011 +0200
s3:registry: change regdb_store_values_internal() from bool to NTSTATUS
return code
commit e1d7cfb41b3b25ad1460570e998d0a6b38a4a1f0
Author: Michael Adam ob...@samba.org
Date: Tue Aug 30 16:00:21 2011 +0200
s3:registry: use the regdb_trans_do wrapper instead of using
dbwrap_trans_do directly in the registry db code.
This verifies the regdb format version number before the corresponding
write operations.
commit 9352a95bfda2d1a3255d8ad158af0fcef442b53e
Author: Michael Adam ob...@samba.org
Date: Mon Aug 29 17:06:27 2011 +0200
s3:registry: add regdb_trans_do(): a transaction wrapper that will check
the regdb version
If the version has changed since initialization, the write will
fail with ACCESS_DENIED.
commit 5ef11737bc8e32446f3819df17af4ae0e93270a0
Author: Michael Adam ob...@samba.org
Date: Tue Aug 30 15:59:30 2011 +0200
s3:registry: drop log level of unknown regdb version message in
regdb_init() to 0
---
Summary of changes:
source3/registry/reg_backend_db.c | 196 +++--
1 files changed, 144 insertions(+), 52 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/registry/reg_backend_db.c
b/source3/registry/reg_backend_db.c
index 58e7b33..0218f05 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -49,8 +49,8 @@ static bool regdb_store_keys_internal(struct db_context *db,
const char *key,
struct regsubkey_ctr *ctr);
static int regdb_fetch_values_internal(struct db_context *db, const char* key,
struct regval_ctr *values);
-static bool regdb_store_values_internal(struct db_context *db, const char *key,
- struct regval_ctr *values);
+static NTSTATUS regdb_store_values_internal(struct db_context *db, const char
*key,
+ struct regval_ctr *values);
static WERROR regdb_store_subkey_list(struct db_context *db, const char
*parent,
const char *key);
@@ -59,6 +59,48 @@ static WERROR regdb_create_subkey_internal(struct db_context
*db,
const char *key,
const char *subkey);
+
+struct regdb_trans_ctx {
+ NTSTATUS (*action)(struct db_context *, void *);
+ void *private_data;
+};
+
+static NTSTATUS regdb_trans_do_action(struct db_context *db, void
*private_data)
+{
+ NTSTATUS status;
+ int32_t version_id;
+ struct regdb_trans_ctx *ctx = (struct regdb_trans_ctx *)private_data;
+
+ version_id = dbwrap_fetch_int32(db, REGDB_VERSION_KEYNAME);
+
+ if (version_id != REGVER_V3) {
+ DEBUG(0, (ERROR: changed registry version %d found while
+ trying to write to the registry. Version %d
+ expected. Denying access.\n,
+ version_id, REGVER_V3));
+ return NT_STATUS_ACCESS_DENIED;
+ }
+
+ status = ctx-action(db, ctx-private_data);
+ return status;
+}
+
+static WERROR regdb_trans_do(struct db_context *db,
+NTSTATUS (*action)(struct db_context *, void *),
+void *private_data)
+{
+
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-09-02-0205/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-09-02-0205/samba3.stderr http://git.samba.org/autobuild.flakey/2011-09-02-0205/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-09-02-0205/samba4.stderr http://git.samba.org/autobuild.flakey/2011-09-02-0205/samba4.stdout The top commit at the time of the failure was: commit e579c84b4fc28ccf95cc8e6cc53c6001f5494ec1 Author: Michael Adam ob...@samba.org Date: Tue Aug 30 16:30:01 2011 +0200 s3:registry: implement regdb_set_secdesc() with regdb_trans_do() Autobuild-User: Michael Adam ob...@samba.org Autobuild-Date: Fri Sep 2 00:51:40 CEST 2011 on sn-devel-104
[SCM] CTDB repository - branch master updated - ctdb-1.11-1-g9118b9c
The branch, master has been updated via 9118b9cf1634866266fbf0a9bf857a622f994a1a (commit) from ee9bf1565383bcca70950e9c20fe6b4d0181ce8d (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 9118b9cf1634866266fbf0a9bf857a622f994a1a Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Fri Sep 2 13:21:33 2011 +1000 tests: Link ctdb_fetch_lock_once with @TDB_OBJ@ not -ltdb so we dont create an unneeded dependency on having a standalone tdb library installed --- Summary of changes: Makefile.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/Makefile.in b/Makefile.in index 02e1d0a..d652a92 100755 --- a/Makefile.in +++ b/Makefile.in @@ -167,9 +167,9 @@ tests/bin/ctdb_fetch_one: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_one.o @echo Linking $@ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) -tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o +tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o @TDB_OBJ@ @echo Linking $@ - @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o libctdb/libctdb.a -ltdb $(LIB_FLAGS) + @$(CC) $(CFLAGS) -o $@ @TDB_OBJ@ tests/src/ctdb_fetch_lock_once.o libctdb/libctdb.a $(LIB_FLAGS) tests/bin/ctdb_store: $(CTDB_CLIENT_OBJ) tests/src/ctdb_store.o @echo Linking $@ -- CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.11-2-gcdbc800
The branch, master has been updated via cdbc800a776f213cfd0ed543cee85b0d1714a186 (commit) from 9118b9cf1634866266fbf0a9bf857a622f994a1a (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit cdbc800a776f213cfd0ed543cee85b0d1714a186 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Fri Sep 2 13:31:41 2011 +1000 tests:ctdb_fetch_lock_once we must link with @POPT_OBJ@ in case -lpopt is not available --- Summary of changes: Makefile.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/Makefile.in b/Makefile.in index d652a92..df1d010 100755 --- a/Makefile.in +++ b/Makefile.in @@ -167,9 +167,9 @@ tests/bin/ctdb_fetch_one: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_one.o @echo Linking $@ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) -tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o @TDB_OBJ@ +tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o @TDB_OBJ@ @POPT_OBJ@ @echo Linking $@ - @$(CC) $(CFLAGS) -o $@ @TDB_OBJ@ tests/src/ctdb_fetch_lock_once.o libctdb/libctdb.a $(LIB_FLAGS) + @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o @TDB_OBJ@ @POPT_OBJ@ libctdb/libctdb.a $(LIB_FLAGS) tests/bin/ctdb_store: $(CTDB_CLIENT_OBJ) tests/src/ctdb_store.o @echo Linking $@ -- CTDB repository
