[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via bdab6f9 Optimization. Don't do the retry logic if sitename_fetch()
returned NULL, we already did a NULL query.
via 68e7b1c Move the retry logic when site_name is passed in a NULL or
"" to the wrapper function.
via 181c110 Move the manipulation of site_name into the caller function
dsgetdcname().
via 66006be Refactor dsgetdcname to be called via a wrapper function.
via dd12bfb dsgetdcname_cache_fetch() doesn't use the site_name
parameter so don't pass it.
from ade8477 torture3: Trigger a nasty cleanup bug in smbd
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bdab6f9431715fbfd28f8cc0dfb4dde2966f22f3
Author: Jeremy Allison
Date: Tue Sep 3 14:07:43 2013 -0700
Optimization. Don't do the retry logic if sitename_fetch() returned NULL,
we already did a NULL query.
Bug 5917 - Samba does not work on site with Read Only Domain Controller
Signed-off-by: Jeremy Allison
Reviewed-by: Andrew Bartlett
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Wed Sep 4 01:19:05 CEST 2013 on sn-devel-104
commit 68e7b1c9446c7d1274b0fb85b59b90ac1a7f6041
Author: Jeremy Allison
Date: Tue Sep 3 12:20:52 2013 -0700
Move the retry logic when site_name is passed in a NULL or "" to the
wrapper function.
Bug 5917 - Samba does not work on site with Read Only Domain Controller
Signed-off-by: Jeremy Allison
Reviewed-by: Andrew Bartlett
Reviewed-by: Richard Sharpe
commit 181c11066bd53b07015a199f56eb71182e89ff71
Author: Jeremy Allison
Date: Tue Sep 3 12:08:46 2013 -0700
Move the manipulation of site_name into the caller function dsgetdcname().
Leave dsgetdcname_internal() only using const char *site_name.
Bug 5917 - Samba does not work on site with Read Only Domain Controller
Signed-off-by: Jeremy Allison
Reviewed-by: Andrew Bartlett
Reviewed-by: Richard Sharpe
commit 66006be7ef703b2935334633d27641050cee5f58
Author: Jeremy Allison
Date: Tue Sep 3 12:04:37 2013 -0700
Refactor dsgetdcname to be called via a wrapper function.
Bug 5917 - Samba does not work on site with Read Only Domain Controller
Signed-off-by: Jeremy Allison
Reviewed-by: Andrew Bartlett
Reviewed-by: Richard Sharpe
commit dd12bfbcbf359c1642cc2e968aec62ae904aad5d
Author: Jeremy Allison
Date: Tue Sep 3 12:13:45 2013 -0700
dsgetdcname_cache_fetch() doesn't use the site_name parameter so don't pass
it.
Bug 5917 - Samba does not work on site with Read Only Domain Controller
Signed-off-by: Jeremy Allison
Reviewed-by: Andrew Bartlett
Reviewed-by: Richard Sharpe
---
Summary of changes:
source3/libsmb/dsgetdcname.c | 85 --
1 files changed, 65 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 028a31b..6818b01 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -320,7 +320,6 @@ static NTSTATUS dsgetdcname_cache_fetch(TALLOC_CTX *mem_ctx,
const char *domain_name,
const struct GUID *domain_guid,
uint32_t flags,
- const char *site_name,
struct netr_DsRGetDCNameInfo **info_p)
{
char *key;
@@ -393,7 +392,7 @@ static NTSTATUS dsgetdcname_cached(TALLOC_CTX *mem_ctx,
NTSTATUS status;
status = dsgetdcname_cache_fetch(mem_ctx, domain_name, domain_guid,
-flags, site_name, info);
+flags, info);
if (!NT_STATUS_IS_OK(status)
&& !NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
DEBUG(10,("dsgetdcname_cached: cache fetch failed with: %s\n",
@@ -1094,12 +1093,10 @@ static bool is_closest_site(struct
netr_DsRGetDCNameInfo *info)
}
/
- dsgetdcname.
-
- This will be the only public function here.
+ Internal dsgetdcname.
/
-NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
+static NTSTATUS dsgetdcname_internal(TALLOC_CTX *mem_ctx,
struct messaging_context *msg_ctx,
const char *domain_name,
const struct GUID *domain_guid,
@@ -1109,15 +1106,14 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
{
NTSTATUS status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
struct netr_DsRGetDCNameInfo *myinfo = NULL;
- char *query_si
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via f1efa59 Add Catalyst IT as global supporting company too from a62a3ab Add Catalyst IT of nz as supporting company http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit f1efa5934a01cef3f2c86d12266d444dc739c43b Author: Lars Müller Date: Tue Sep 3 21:04:18 2013 +0200 Add Catalyst IT as global supporting company too --- Summary of changes: support/globalsupport.html | 29 + 1 files changed, 29 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/support/globalsupport.html b/support/globalsupport.html index 22f5d00..9ab5510 100644 --- a/support/globalsupport.html +++ b/support/globalsupport.html @@ -5,6 +5,35 @@ Commercial Support - Global Support + +Catalyst IT Ltd + +http://www.catalyst.net.nz/";>http://www.catalyst.net.nz ++64 4 499 2267 +mailto:i...@catalyst.net.nz";>i...@catalyst.net.nz +Catalyst House, 150 Willis Street +Wellington, New Zealand + + +Catalyst is an open source specialist and is known for a number of +valuable contributions to free and open source projects worldwide. Our +main lines of business are consultancy, software development, system +integration, hosting and training. We have 180+ staff members and +offices in New Zealand, Australia and UK. + +Catalyst is now proud to offer Samba support and development services, +with a particular focus on the Samba Active Directory Domain Controller. +Our ongoing support services are backed by a Service Level Agreement +(SLA). + +Andrew Bartlett brings over a decade of experience on the Samba Team and +leads our Samba consultancy group. Andrew has been a key developer on +the "Samba4" Active Directory Domain Controller project since its +inception in 2005 through to its production release in Samba 4.0 and +beyond. + + + Erion Ltd -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ade8477 torture3: Trigger a nasty cleanup bug in smbd
via 7d91ffc smbd: Fix flawed share_mode_stale_pid API
via 5006db9 smbd: Rename parameter "i" to "idx"
via 696bc56 smbd: Don't store in-memory only flags in locking.tdb
via 94b3205 smbd: Simplify find_oplock_types
from 871488a docs: fix a typo on the description of "acl check
permissions"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ade8477f98fcffcc6e3c5ea31618b49d0c1bba95
Author: Volker Lendecke
Date: Sun Sep 1 18:54:59 2013 +0200
torture3: Trigger a nasty cleanup bug in smbd
Signed-off-by: Volker Lendecke
Reviewed-by: Michael Adam
Autobuild-User(master): Michael Adam
Autobuild-Date(master): Tue Sep 3 19:13:14 CEST 2013 on sn-devel-104
commit 7d91ffc6fdc3b371564e14f09822a96264ea372a
Author: Volker Lendecke
Date: Fri Aug 30 12:49:43 2013 +
smbd: Fix flawed share_mode_stale_pid API
The comment for this routine said:
> Modifies d->num_share_modes, watch out in routines iterating over
> that array.
Well, it turns out that *every* caller of this API got it wrong. So I
think it's better to change the routine.
This leaves the array untouched while iterating but filters out the
deleted ones while saving them back to disk.
Signed-off-by: Volker Lendecke
Reviewed-by: Michael Adam
commit 5006db98aaf1efe119f1da8be091587a9bc2b952
Author: Volker Lendecke
Date: Fri Aug 30 12:27:36 2013 +
smbd: Rename parameter "i" to "idx"
We'll need "i" in a later checkin ... :-)
Signed-off-by: Volker Lendecke
Reviewed-by: Michael Adam
commit 696bc569b17f024f840774e3d59761229836a310
Author: Volker Lendecke
Date: Sun Sep 1 11:07:19 2013 +0200
smbd: Don't store in-memory only flags in locking.tdb
Hey, pidl knows the [skip] attribute ... :-)
Signed-off-by: Volker Lendecke
Reviewed-by: Michael Adam
commit 94b320527eee0c7ba1d3818816e7d59cb863bf3f
Author: Volker Lendecke
Date: Thu Aug 22 08:49:07 2013 +
smbd: Simplify find_oplock_types
Signed-off-by: Volker Lendecke
Reviewed-by: Michael Adam
---
Summary of changes:
source3/librpc/idl/open_files.idl | 10 -
source3/locking/locking.c | 47 +
source3/locking/proto.h |2 +-
source3/locking/share_mode_lock.c | 24 +
source3/selftest/tests.py |1 +
source3/smbd/open.c | 19 +-
source3/torture/proto.h |1 +
source3/torture/test_cleanup.c| 70 +
source3/torture/torture.c |1 +
9 files changed, 148 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/librpc/idl/open_files.idl
b/source3/librpc/idl/open_files.idl
index fa87bc7..686bc02 100644
--- a/source3/librpc/idl/open_files.idl
+++ b/source3/librpc/idl/open_files.idl
@@ -23,6 +23,12 @@ interface open_files
uint32 uid;
uint16 flags;
uint32 name_hash;
+
+ /*
+* In-memory flag indicating a non-existing pid. We don't want
+* to store this share_mode_entry on disk.
+*/
+ [skip] boolean8 stale;
} share_mode_entry;
typedef [public] struct {
@@ -42,8 +48,8 @@ interface open_files
[size_is(num_delete_tokens)] delete_token delete_tokens[];
timespec old_write_time;
timespec changed_write_time;
- uint8 fresh;
- uint8 modified;
+ [skip] boolean8 fresh;
+ [skip] boolean8 modified;
[ignore] db_record *record;
} share_mode_data;
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 7e65616..5090082 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -617,6 +617,10 @@ bool is_valid_share_mode_entry(const struct
share_mode_entry *e)
{
int num_props = 0;
+ if (e->stale) {
+ return false;
+ }
+
num_props += ((e->op_type == NO_OPLOCK) ? 1 : 0);
num_props += (EXCLUSIVE_OPLOCK_TYPE(e->op_type) ? 1 : 0);
num_props += (LEVEL_II_OPLOCK_TYPE(e->op_type) ? 1 : 0);
@@ -630,40 +634,53 @@ bool is_valid_share_mode_entry(const struct
share_mode_entry *e)
/*
* In case d->share_modes[i] conflicts with something or otherwise is
* being used, we need to make sure the corresponding process still
- * exists. This routine checks it and potentially removes the entry
- * from d->share_modes. Modifies d->num_share_modes, watch out in
- * routines iterating over that array.
+ *
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/2013-09-03-1620/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2013-09-03-1620/samba3.stderr http://git.samba.org/autobuild.flakey/2013-09-03-1620/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2013-09-03-1620/samba.stderr http://git.samba.org/autobuild.flakey/2013-09-03-1620/samba.stdout The top commit at the time of the failure was: commit 871488ac43d93eb3d971a64864f8e200a4c8dbed Author: Michael Adam Date: Mon Sep 2 16:53:48 2013 +0200 docs: fix a typo on the description of "acl check permissions" Signed-off-by: Michael Adam Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Mon Sep 2 23:03:01 CEST 2013 on sn-devel-104
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via a62a3ab Add Catalyst IT of nz as supporting company via cc40086 Merge branch 'master' of git+ssh://git.samba.org/data/git/samba-web via e1ddbe1 Use always the same amount of hyphens in the title from fbce6bd Announce Samba 4.0.9. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit a62a3ab1112e516a682e399a089e8fb8d50e8c61 Author: Lars Müller Date: Tue Sep 3 14:37:28 2013 +0200 Add Catalyst IT of nz as supporting company commit cc400864452f7546f3f5de6eb15ddbf890d26ecb Merge: e1ddbe1e15a6299704283c1c7703c1e3921975bb fbce6bd30bc64acf159500ab6698309a17045c71 Author: Lars Müller Date: Tue Sep 3 14:01:05 2013 +0200 Merge branch 'master' of git+ssh://git.samba.org/data/git/samba-web commit e1ddbe1e15a6299704283c1c7703c1e3921975bb Author: Lars Müller Date: Fri May 10 17:28:04 2013 +0200 Use always the same amount of hyphens in the title --- Summary of changes: support/argentina.html |2 +- support/brazil.html|2 +- support/bulgaria.html |2 +- support/czechrepublic.html |2 +- support/denmark.html |2 +- support/egypt.html |2 +- support/greece.html|2 +- support/hongkong.html |2 +- support/hungary.html |2 +- support/ireland.html |2 +- support/latvia.html|2 +- support/malaysia.html |2 +- support/netherlands.html |2 +- support/newzealand.html| 29 + support/romania.html |2 +- support/saudiarabia.html |2 +- support/serbia.html|2 +- support/singapore.html |2 +- support/slovakia.html |2 +- support/sweden.html|2 +- support/turkey.html|2 +- 21 files changed, 49 insertions(+), 20 deletions(-) Changeset truncated at 500 lines: diff --git a/support/argentina.html b/support/argentina.html index 01dd519..4881a0f 100644 --- a/support/argentina.html +++ b/support/argentina.html @@ -1,5 +1,5 @@ - Samba Support--Argentina + Samba Support -- Argentina Commercial Support - Argentina diff --git a/support/brazil.html b/support/brazil.html index 05026e2..85c334a 100644 --- a/support/brazil.html +++ b/support/brazil.html @@ -1,5 +1,5 @@ - Samba Support--Brazil + Samba Support -- Brazil Commercial Support - BRAZIL diff --git a/support/bulgaria.html b/support/bulgaria.html index 3f7f44f..a158225 100644 --- a/support/bulgaria.html +++ b/support/bulgaria.html @@ -1,5 +1,5 @@ - Samba Support--Bulgaria + Samba Support -- Bulgaria Commercial Support - Bulgaria diff --git a/support/czechrepublic.html b/support/czechrepublic.html index 800e375..33affc8 100644 --- a/support/czechrepublic.html +++ b/support/czechrepublic.html @@ -1,5 +1,5 @@ - Samba Support--Czech Republic + Samba Support -- Czech Republic Commercial Support - Czech Republic diff --git a/support/denmark.html b/support/denmark.html index 0e04d29..a5f02c3 100644 --- a/support/denmark.html +++ b/support/denmark.html @@ -1,5 +1,5 @@ - Samba Support--Denmark + Samba Support -- Denmark Commercial Support - Denmark diff --git a/support/egypt.html b/support/egypt.html index 1a4ea67..2c66d5c 100644 --- a/support/egypt.html +++ b/support/egypt.html @@ -1,5 +1,5 @@ - Samba Support--Egypt + Samba Support -- Egypt Commercial Support - Egypt diff --git a/support/greece.html b/support/greece.html index 86b0118..88740bc 100644 --- a/support/greece.html +++ b/support/greece.html @@ -1,5 +1,5 @@ - Samba Support--Greece + Samba Support -- Greece Commercial Support - Greece diff --git a/support/hongkong.html b/support/hongkong.html index ed2ff86..15b3708 100644 --- a/support/hongkong.html +++ b/support/hongkong.html @@ -1,5 +1,5 @@ - Samba Support--Hong Kong/China + Samba Support -- Hong Kong/China Commercial Support - Hong Kong/China diff --git a/support/hungary.html b/support/hungary.html index d063623..83025ec 100644 --- a/support/hungary.html +++ b/support/hungary.html @@ -1,5 +1,5 @@ - Samba Support--Hungary + Samba Support -- Hungary Commercial Support - Hungary diff --git a/support/ireland.html b/support/ireland.html index 85e7257..46dd85e 100644 --- a/support/ireland.html +++ b/support/ireland.html @@ -1,5 +1,5 @@ - Samba Support--Ireland + Samba Support -- Ireland Commercial Support -- Ireland diff --git a/support/latvia.html b/support/latvia.html index 8093c44..647bcd2 100644 --- a/support/latvia.html +++ b/support/latvia.html @@ -1,5 +1,5 @@ - Samba Support--Latvia + Samba Support -- Latvia Commercial Support - Latvia diff --git a/support/malaysia.html b/support/malaysia.html index 7ae56ce..942e871 100644 --- a/support/malaysia.html +++ b/support/malaysia.html @@ -1,5 +1,5 @@
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/2013-09-03-1342/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2013-09-03-1342/samba3.stderr http://git.samba.org/autobuild.flakey/2013-09-03-1342/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2013-09-03-1342/samba.stderr http://git.samba.org/autobuild.flakey/2013-09-03-1342/samba.stdout The top commit at the time of the failure was: commit 871488ac43d93eb3d971a64864f8e200a4c8dbed Author: Michael Adam Date: Mon Sep 2 16:53:48 2013 +0200 docs: fix a typo on the description of "acl check permissions" Signed-off-by: Michael Adam Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Mon Sep 2 23:03:01 CEST 2013 on sn-devel-104
