[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7829395 dsdb: Rename a parameter
from 6c4e3cf ctdb-packaging: Package private libraries
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 782939592671b9fb2c92910c6151f2d739ca7645
Author: Volker Lendecke v...@samba.org
Date: Wed Jun 24 17:02:53 2015 +0200
dsdb: Rename a parameter
Coverity was confused by the 'seq_num' variable as an argument for the
'local_usn' parameter, where also a 'seq_num' parameter exists. Doesn't
hurt,
and if it kills a Coverity warning, why not...
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Stefan (metze) Metzmacher me...@samba.org
Autobuild-User(master): Volker Lendecke v...@samba.org
Autobuild-Date(master): Wed Jul 1 14:09:14 CEST 2015 on sn-devel-104
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 4c5ced4..4ff1395 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -1837,7 +1837,7 @@ static int replmd_check_upgrade_links(struct parsed_dn
*dns, uint32_t count, str
*/
static int replmd_update_la_val(TALLOC_CTX *mem_ctx, struct ldb_val *v, struct
dsdb_dn *dsdb_dn,
struct dsdb_dn *old_dsdb_dn, const struct GUID
*invocation_id,
- uint64_t seq_num, uint64_t local_usn, NTTIME
nttime,
+ uint64_t usn, uint64_t local_usn, NTTIME nttime,
uint32_t version, bool deleted)
{
struct ldb_dn *dn = dsdb_dn-dn;
@@ -1860,7 +1860,7 @@ static int replmd_update_la_val(TALLOC_CTX *mem_ctx,
struct ldb_val *v, struct d
}
tval = data_blob_string_const(tstring);
- usn_string = talloc_asprintf(mem_ctx, %llu, (unsigned long
long)seq_num);
+ usn_string = talloc_asprintf(mem_ctx, %llu, (unsigned long long)usn);
if (!usn_string) {
return LDB_ERR_OPERATIONS_ERROR;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 5ce5263 lib: Trim blocking.c from 7829395 dsdb: Rename a parameter https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5ce52633d5d720dddb13d825dd3f2894b7d057f3 Author: Volker Lendecke v...@samba.org Date: Wed Jul 1 11:44:09 2015 +0200 lib: Trim blocking.c Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Martin Schwenke mar...@meltin.net Autobuild-User(master): Martin Schwenke mart...@samba.org Autobuild-Date(master): Wed Jul 1 17:12:48 CEST 2015 on sn-devel-104 --- Summary of changes: lib/util/blocking.c | 7 --- 1 file changed, 7 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/blocking.c b/lib/util/blocking.c index 358eda0..0d845c0 100644 --- a/lib/util/blocking.c +++ b/lib/util/blocking.c @@ -22,15 +22,8 @@ */ #include replace.h -#include system/network.h #include system/filesys.h -#include system/locale.h #include blocking.h -#undef malloc -#undef strcasecmp -#undef strncasecmp -#undef strdup -#undef realloc /** Set a fd into blocking/nonblocking mode. Uses POSIX O_NONBLOCK if available, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 86cff1d tevent: add and use debug class for tevent
via b3e34d8 debug: get rid of DBGC_MAX_FIXED
from 5ce5263 lib: Trim blocking.c
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 86cff1dbe23bb1e46cf9c9c3c3ec20058f09ed6e
Author: Ralph Boehme s...@samba.org
Date: Sun Jun 28 20:44:37 2015 +0200
tevent: add and use debug class for tevent
Signed-off-by: Ralph Boehme s...@samba.org
Reviewed-by: Guenther Deschner g...@samba.org
Autobuild-User(master): Günther Deschner g...@samba.org
Autobuild-Date(master): Wed Jul 1 23:04:00 CEST 2015 on sn-devel-104
commit b3e34d8c1b6c08f03f9ac10414bf6d8a8e404963
Author: Ralph Boehme s...@samba.org
Date: Wed May 13 16:03:38 2015 +0200
debug: get rid of DBGC_MAX_FIXED
Simplify class table by using designated array initializers and
ARRAY_SIZE macro.
Signed-off-by: Ralph Boehme s...@samba.org
Pair-Programmed-With: Stefan Metzmacher me...@samba.org
Reviewed-by: Guenther Deschner g...@samba.org
---
Summary of changes:
lib/util/debug.c| 62 -
lib/util/debug.h| 4 +---
lib/util/tevent_debug.c | 3 +++
3 files changed, 35 insertions(+), 34 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/debug.c b/lib/util/debug.c
index dce3292..726c682 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -416,11 +416,38 @@ static void debug_backends_log(const char *msg, int
msg_level)
*/
booloverride_logfile;
+static const char *default_classname_table[] = {
+ [DBGC_ALL] =all,
+ [DBGC_TDB] =tdb,
+ [DBGC_PRINTDRIVERS] = printdrivers,
+ [DBGC_LANMAN] = lanman,
+ [DBGC_SMB] =smb,
+ [DBGC_RPC_PARSE] = rpc_parse,
+ [DBGC_RPC_SRV] =rpc_srv,
+ [DBGC_RPC_CLI] =rpc_cli,
+ [DBGC_PASSDB] = passdb,
+ [DBGC_SAM] =sam,
+ [DBGC_AUTH] = auth,
+ [DBGC_WINBIND] =winbind,
+ [DBGC_VFS] =vfs,
+ [DBGC_IDMAP] = idmap,
+ [DBGC_QUOTA] = quota,
+ [DBGC_ACLS] = acls,
+ [DBGC_LOCKING] =locking,
+ [DBGC_MSDFS] = msdfs,
+ [DBGC_DMAPI] = dmapi,
+ [DBGC_REGISTRY] = registry,
+ [DBGC_SCAVENGER] = scavenger,
+ [DBGC_DNS] =dns,
+ [DBGC_LDB] =ldb,
+ [DBGC_TEVENT] = tevent,
+};
+
/*
* This is to allow reading of DEBUGLEVEL_CLASS before the debug
* system has been initialized.
*/
-static const int debug_class_list_initial[DBGC_MAX_FIXED + 1];
+static const int debug_class_list_initial[ARRAY_SIZE(default_classname_table)];
static int debug_num_classes = 0;
int *DEBUGLEVEL_CLASS = discard_const_p(int, debug_class_list_initial);
@@ -460,32 +487,6 @@ static boollog_overflow = false;
* white space. There must be one name for each DBGC_class name, and they
* must be in the table in the order of DBGC_class name..
*/
-static const char *default_classname_table[] = {
- all, /* DBGC_ALL; index refs traditional DEBUGLEVEL */
- tdb, /* DBGC_TDB */
- printdrivers, /* DBGC_PRINTDRIVERS */
- lanman,/* DBGC_LANMAN */
- smb, /* DBGC_SMB */
- rpc_parse, /* DBGC_RPC_PARSE*/
- rpc_srv, /* DBGC_RPC_SRV */
- rpc_cli, /* DBGC_RPC_CLI */
- passdb,/* DBGC_PASSDB */
- sam, /* DBGC_SAM */
- auth, /* DBGC_AUTH */
- winbind, /* DBGC_WINBIND */
- vfs, /* DBGC_VFS */
- idmap, /* DBGC_IDMAP*/
- quota, /* DBGC_QUOTA*/
- acls, /* DBGC_ACLS */
- locking, /* DBGC_LOCKING */
- msdfs, /* DBGC_MSDFS*/
- dmapi, /* DBGC_DMAPI*/
- registry, /* DBGC_REGISTRY */
- scavenger, /* DBGC_SCAVENGER*/
- dns, /* DBGC_DNS */
- ldb, /* DBGC_LDB */
- NULL
-};
static char **classname_table = NULL;
@@ -744,8 +745,7 @@ Init debugging (one time stuff)
static void debug_init(void)
{
- int i;
- const char **p;
+ size_t i;
if (state.initialized)
return;
@@ -754,8 +754,8 @@ static void debug_init(void)
debug_setup_talloc_log();
- for(p = default_classname_table; *p; p++) {
- debug_add_class(*p);
+ for
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ddc4c67 librpc: prevent invalid NULL pointer derref in
dcerpc_binding_get_auth_info().
via 20075e6 s3:vfs: copy_chunk buffer size
via 4e28dd1 selftest: Plan samba3.blackbox.preserve_case testcase
via f72be14 tests: Add test_preserve_case.sh
via 451dc38 selftest: Add setup_fileserver()
via 2b644e3 s3:libsmb: fix resolve_ads return if there were no answers
from 86cff1d tevent: add and use debug class for tevent
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ddc4c6767a98bb087bb435ed3a4591e75637b1e8
Author: Günther Deschner g...@samba.org
Date: Wed Jul 1 17:14:10 2015 +0200
librpc: prevent invalid NULL pointer derref in
dcerpc_binding_get_auth_info().
Guenther
Signed-off-by: Günther Deschner g...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Thu Jul 2 02:05:38 CEST 2015 on sn-devel-104
commit 20075e6b3082939fbd5d7ca4f327d29d62c33c87
Author: Ralph Boehme s...@samba.org
Date: Wed Jul 1 17:57:36 2015 +0200
s3:vfs: copy_chunk buffer size
Use a dynamically allocated copy_chunk buffer size with an upper bound
of 8 MB for now.
The previous size of 64 KB has proven to really hurt performance,
especially with strict locking = yes.
The SMB2 protocol level maximum allowed copy_chunk size is 1 MB, that's
what will be used as buffer size in the typical case.
With the AAPL copyfile extension the requested copy_chunk size is the
size whole file, which would then make use of a larger buffer up to the
limit of 8 MB.
Signed-off-by: Ralph Boehme s...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit 4e28dd16c528e3bf3cfa0a4ecfdee9188f02ec49
Author: Andreas Schneider a...@samba.org
Date: Wed Jul 1 14:09:32 2015 +0200
selftest: Plan samba3.blackbox.preserve_case testcase
Signed-off-by: Andreas Schneider a...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit f72be14315b9e2574980127b7c0f9fdcbea10d37
Author: Andreas Schneider a...@samba.org
Date: Fri May 15 10:05:26 2015 +0200
tests: Add test_preserve_case.sh
Test for: https://bugzilla.samba.org/show_bug.cgi?id=10650
Signed-off-by: Andreas Schneider a...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit 451dc3889ef530174f80177d5e8b84c6a8b8e777
Author: Robin Hack rh...@redhat.com
Date: Fri May 15 09:43:29 2015 +0200
selftest: Add setup_fileserver()
Pair-Programmed-With: Andreas Schneider a...@samba.org
Signed-off-by: Robin Hack rh...@redhat.com
Signed-off-by: Andreas Schneider a...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit 2b644e3d5dcbc286468764cd48b6b7044463d5df
Author: Michael Adam ob...@samba.org
Date: Tue Jun 30 16:51:43 2015 +0200
s3:libsmb: fix resolve_ads return if there were no answers
Signed-off-by: Michael Adam ob...@samba.org
Reviewed-by: Stefan (metze) Metzmacher me...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
---
Summary of changes:
librpc/rpc/binding.c | 4 +-
selftest/target/Samba.pm | 1 +
selftest/target/Samba3.pm | 96 +-
source3/libsmb/namequery.c | 7 +++
source3/modules/vfs_default.c | 10 +++-
source3/script/tests/test_preserve_case.sh | 78
source3/selftest/tests.py | 2 +
7 files changed, 193 insertions(+), 5 deletions(-)
create mode 100755 source3/script/tests/test_preserve_case.sh
Changeset truncated at 500 lines:
diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c
index 37e0c4f..f131d00 100644
--- a/librpc/rpc/binding.c
+++ b/librpc/rpc/binding.c
@@ -596,11 +596,11 @@ _PUBLIC_ void dcerpc_binding_get_auth_info(const struct
dcerpc_binding *b,
auth_level = DCERPC_AUTH_LEVEL_NONE;
}
- if (_auth_type == NULL) {
+ if (_auth_type != NULL) {
*_auth_type = auth_type;
}
- if (_auth_level == NULL) {
+ if (_auth_level != NULL) {
*_auth_level = auth_level;
}
}
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 4949086..e128fd3 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -177,6 +177,7 @@ sub get_interface($)
$interfaces{chgdcpass} = 32;
$interfaces{promotedvdc} = 33;
$interfaces{rfc2307member} = 34;
+$interfaces{fileserver} = 35;
# update lib/socket_wrapper/socket_wrapper.c
# #define MAX_WRAPPED_INTERFACES 32
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index a380e7a..03c78f2 100755
---
