Build status as of Mon Oct 26 06:00:03 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-10-25 00:00:05.0 -0600 +++ /home/build/master/cache/broken_results.txt 2009-10-26 00:00:05.0 -0600 @@ -1,22 +1,22 @@ -Build status as of Sun Oct 25 06:00:04 2009 +Build status as of Mon Oct 26 06:00:03 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 2 1 0 +ccache 3 1 0 distcc 0 0 0 -ldb 24 24 0 +ldb 25 25 0 libreplace 1 1 0 lorikeet 0 0 0 -pidl 1 1 0 -ppp 7 0 0 -rsync24 9 0 +pidl 2 2 0 +ppp 8 0 0 +rsync25 9 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 21 20 0 -samba_3_master 22 21 0 -samba_3_next 22 22 0 -samba_4_0_test 22 22 0 -talloc 1 1 0 -tdb 22 22 0 +samba_3_current 22 21 0 +samba_3_master 23 22 0 +samba_3_next 23 23 0 +samba_4_0_test 23 23 0 +talloc 2 2 0 +tdb 23 23 0
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated
via a0fbf06... s3: Fix crash in pam_winbind, another reference to freed
memory.
via 587ca74... Fix bug 6829 - smbclient does not show special
characters properly. All successful calls to cli_session_setup() *must* be
followed by calls to cli_init_creds() to stash the credentials we successfully
connected with. There were 2 codepaths where this was missing. This caused
smbclient to be unable to open the \srvsvc pipe to do an RPC netserverenum, and
cause it to fall back to a RAP netserverenum, which uses DOS codepage
conversion rather than the full UCS2 of RPC, so the returned characters were
not correct (unless the DOS codepage was set correctly). Phew. That was fun to
track down :-). Includes logic simplification in libsmb_server.c Jeremy.
from a572c28... Fix bug 6828 - infinite timeout occurs when byte lock
held outside of samba Jeremy.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit a0fbf067011ae50d63c6ed2a79f1ff00c2ce2d11
Author: Bo Yang boy...@samba.org
Date: Sat Oct 24 09:20:00 2009 +0800
s3: Fix crash in pam_winbind, another reference to freed memory.
Fix bug #6840.
Signed-off-by: Bo Yang boy...@samba.org
(cherry picked from commit b9a3f1dd85d168c15df846dba525f4f882d1acf8)
commit 587ca743bf1491e97c984ce4bec5a9bd0a1ae69a
Author: Jeremy Allison j...@samba.org
Date: Thu Oct 22 15:30:47 2009 -0700
Fix bug 6829 - smbclient does not show special characters properly. All
successful calls to cli_session_setup() *must* be followed by calls to
cli_init_creds() to stash the credentials we successfully connected with. There
were 2 codepaths where this was missing. This caused smbclient to be unable to
open the \srvsvc pipe to do an RPC netserverenum, and cause it to fall back to
a RAP netserverenum, which uses DOS codepage conversion rather than the full
UCS2 of RPC, so the returned characters were not correct (unless the DOS
codepage was set correctly). Phew. That was fun to track down :-). Includes
logic simplification in libsmb_server.c Jeremy.
---
Summary of changes:
nsswitch/pam_winbind.c | 10 +++---
source3/libsmb/clidfs.c|9 +
source3/libsmb/libsmb_server.c |8
3 files changed, 24 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index ab22c7c..ec05f75 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1784,7 +1784,7 @@ static int winbind_auth_request(struct pwb_context *ctx,
if (logon.blobs) {
wbcFreeMemory(logon.blobs);
}
- if (info info-blobs) {
+ if (info info-blobs !p_info) {
wbcFreeMemory(info-blobs);
}
if (error !p_error) {
@@ -3138,10 +3138,14 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
free(username_ret);
}
- wbcFreeMemory(info);
- wbcFreeMemory(policy);
}
+ if (info info-blobs) {
+ wbcFreeMemory(info-blobs);
+ }
+ wbcFreeMemory(info);
+ wbcFreeMemory(policy);
+
goto out;
}
} else {
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 5e944f1..53dc6d7 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -216,6 +216,15 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx,
return NULL;
}
d_printf(Anonymous login successful\n);
+ status = cli_init_creds(c, , lp_workgroup(), );
+ } else {
+ status = cli_init_creds(c, username, lp_workgroup(), password);
+ }
+
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(10,(cli_init_creds() failed: %s\n, nt_errstr(status)));
+ cli_shutdown(c);
+ return NULL;
}
if ( show_sessetup ) {
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 60849c8..cf2d1d5 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -500,6 +500,14 @@ again:
}
}
+ status = cli_init_creds(c, username_used,
+ *pp_workgroup, *pp_password);
+ if (!NT_STATUS_IS_OK(status)) {
+ errno = map_errno_from_nt_status(status);
+ cli_shutdown(c);
+ return NULL;
+ }
+
DEBUG(4,( session setup ok\n));
status = cli_tcon_andx(c, share, ?, *pp_password,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated
The branch, v3-3-test has been updated
via 1791b1c... s3: Fix crash in pam_winbind, another reference to freed
memory.
via bbeda13... Fix bug 6829 - smbclient does not show special
characters properly. All successful calls to cli_session_setup() *must* be
followed by calls to cli_init_creds() to stash the credentials we successfully
connected with. There were 2 codepaths where this was missing. This caused
smbclient to be unable to open the \srvsvc pipe to do an RPC netserverenum, and
cause it to fall back to a RAP netserverenum, which uses DOS codepage
conversion rather than the full UCS2 of RPC, so the returned characters were
not correct (unless the DOS codepage was set correctly). Phew. That was fun to
track down :-). Includes logic simplification in libsmb_server.c Jeremy.
from 4fce98c... Fix bug 6828 - infinite timeout occurs when byte lock
held outside of samba Jeremy.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 1791b1cc43ce744c73b473aff0e311acbdf0ee4e
Author: Bo Yang boy...@samba.org
Date: Sat Oct 24 10:55:36 2009 +0800
s3: Fix crash in pam_winbind, another reference to freed memory.
Fix bug #6840.
Signed-off-by: Bo Yang boy...@samba.org
commit bbeda1398687b79596769a5d046e1e0f249bd382
Author: Jeremy Allison j...@samba.org
Date: Thu Oct 22 15:35:59 2009 -0700
Fix bug 6829 - smbclient does not show special characters properly. All
successful calls to cli_session_setup() *must* be followed by calls to
cli_init_creds() to stash the credentials we successfully connected with. There
were 2 codepaths where this was missing. This caused smbclient to be unable to
open the \srvsvc pipe to do an RPC netserverenum, and cause it to fall back to
a RAP netserverenum, which uses DOS codepage conversion rather than the full
UCS2 of RPC, so the returned characters were not correct (unless the DOS
codepage was set correctly). Phew. That was fun to track down :-). Includes
logic simplification in libsmb_server.c Jeremy.
---
Summary of changes:
source/libsmb/clidfs.c|3 +++
source/libsmb/libsmb_server.c |2 ++
source/nsswitch/pam_winbind.c | 10 +++---
3 files changed, 12 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clidfs.c b/source/libsmb/clidfs.c
index 5379ff9..1b17679 100644
--- a/source/libsmb/clidfs.c
+++ b/source/libsmb/clidfs.c
@@ -235,6 +235,9 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx,
return NULL;
}
d_printf(Anonymous login successful\n);
+ cli_init_creds(c, , lp_workgroup(), );
+ } else {
+ cli_init_creds(c, username, lp_workgroup(), password);
}
if ( show_sessetup ) {
diff --git a/source/libsmb/libsmb_server.c b/source/libsmb/libsmb_server.c
index 6880f5c..dfb56b0 100644
--- a/source/libsmb/libsmb_server.c
+++ b/source/libsmb/libsmb_server.c
@@ -497,6 +497,8 @@ again:
return NULL;
}
}
+
+ cli_init_creds(c, username_used, *pp_workgroup, *pp_password);
DEBUG(4,( session setup ok\n));
diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index 3d0c5ef..7454081 100644
--- a/source/nsswitch/pam_winbind.c
+++ b/source/nsswitch/pam_winbind.c
@@ -1784,7 +1784,7 @@ static int winbind_auth_request(struct pwb_context *ctx,
if (logon.blobs) {
wbcFreeMemory(logon.blobs);
}
- if (info info-blobs) {
+ if (info info-blobs !p_info) {
wbcFreeMemory(info-blobs);
}
if (error !p_error) {
@@ -3138,10 +3138,14 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
free(username_ret);
}
- wbcFreeMemory(info);
- wbcFreeMemory(policy);
}
+ if (info info-blobs) {
+ wbcFreeMemory(info-blobs);
+ }
+ wbcFreeMemory(info);
+ wbcFreeMemory(policy);
+
goto out;
}
} else {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 02dd895... s3:docs: fake dir create times is a global parameter. from a4f86c0... s4-ldb: fixed request handling for schemaUpdateNow op http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 02dd89520215c88c3c90a91a6a6aac8ba412803a Author: Karolin Seeger ksee...@samba.org Date: Mon Oct 26 09:33:37 2009 +0100 s3:docs: fake dir create times is a global parameter. Karolin --- Summary of changes: .../smbdotconf/misc/fakedirectorycreatetimes.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml index 974b6f0..7c8807e 100644 --- a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml +++ b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml @@ -1,5 +1,5 @@ samba:parameter name=fake directory create times -context=S +context=G type=boolean xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; description -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 77197f3... WHATSNEW: Update release notes. from 8aafa80... s3:docs: fake dir create times is a global parameter. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 77197f3a610d121efca312d30eda829f30747f45 Author: Karolin Seeger ksee...@samba.org Date: Mon Oct 26 09:49:38 2009 +0100 WHATSNEW: Update release notes. Karolin --- Summary of changes: WHATSNEW.txt |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index f34e497..dbf8e16 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -21,8 +21,9 @@ smb.conf changes Parameter Name Description Default -- --- --- + create krb5 conf New yes ldap ref followNew auto - + store create time New no ## -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 35dc481... s3:docs: Public is not a synonym for access based shareenum. from 02dd895... s3:docs: fake dir create times is a global parameter. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 35dc481289c28a77f354dd76193d6298de32c66d Author: Karolin Seeger ksee...@samba.org Date: Mon Oct 26 10:14:51 2009 +0100 s3:docs: Public is not a synonym for access based shareenum. Fix build warning. Karolin --- Summary of changes: .../smbdotconf/security/accessbasedshareenum.xml |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/security/accessbasedshareenum.xml b/docs-xml/smbdotconf/security/accessbasedshareenum.xml index c2977c4..8b94648 100644 --- a/docs-xml/smbdotconf/security/accessbasedshareenum.xml +++ b/docs-xml/smbdotconf/security/accessbasedshareenum.xml @@ -3,7 +3,6 @@ context=S basic=1 advanced=1 developer=1 xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; - synonympublic/synonym description paraIf this parameter is constantyes/constant for a service, then the share hosted by the service will only be visible -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 7601427... s3:docs: Public is not a synonym for access based shareenum. from 77197f3... WHATSNEW: Update release notes. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 7601427a2db1263b0192c1a78d8bacb7eb0b74da Author: Karolin Seeger ksee...@samba.org Date: Mon Oct 26 10:14:51 2009 +0100 s3:docs: Public is not a synonym for access based shareenum. Fix build warning. Karolin (cherry picked from commit 35dc481289c28a77f354dd76193d6298de32c66d) --- Summary of changes: .../smbdotconf/security/accessbasedshareenum.xml |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/security/accessbasedshareenum.xml b/docs-xml/smbdotconf/security/accessbasedshareenum.xml index c2977c4..8b94648 100644 --- a/docs-xml/smbdotconf/security/accessbasedshareenum.xml +++ b/docs-xml/smbdotconf/security/accessbasedshareenum.xml @@ -3,7 +3,6 @@ context=S basic=1 advanced=1 developer=1 xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; - synonympublic/synonym description paraIf this parameter is constantyes/constant for a service, then the share hosted by the service will only be visible -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via d6ecfb2... s3:docs: Public is not a synonym for access based shareenum. from a0fbf06... s3: Fix crash in pam_winbind, another reference to freed memory. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit d6ecfb23cfc841ad0bfe8ae677ddbbba7fd36f31 Author: Karolin Seeger ksee...@samba.org Date: Mon Oct 26 10:14:51 2009 +0100 s3:docs: Public is not a synonym for access based shareenum. Fix build warning. Karolin (cherry picked from commit 35dc481289c28a77f354dd76193d6298de32c66d) (cherry picked from commit 7601427a2db1263b0192c1a78d8bacb7eb0b74da) --- Summary of changes: .../smbdotconf/security/accessbasedshareenum.xml |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/security/accessbasedshareenum.xml b/docs-xml/smbdotconf/security/accessbasedshareenum.xml index c2977c4..8b94648 100644 --- a/docs-xml/smbdotconf/security/accessbasedshareenum.xml +++ b/docs-xml/smbdotconf/security/accessbasedshareenum.xml @@ -3,7 +3,6 @@ context=S basic=1 advanced=1 developer=1 xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; - synonympublic/synonym description paraIf this parameter is constantyes/constant for a service, then the share hosted by the service will only be visible -- Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 9442e256ce46ab4c80883a7a2fb793d4ea1f7010
The branch, v3-4-ctdb has been updated
via 9442e256ce46ab4c80883a7a2fb793d4ea1f7010 (commit)
via 37362895503a11433ee7005a95db1e5d77192361 (commit)
from 15ab290f79f516bde3dde6ef9a9cfd55a3bc3a37 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb
- Log -
commit 9442e256ce46ab4c80883a7a2fb793d4ea1f7010
Author: Volker Lendecke v...@samba.org
Date: Thu Oct 22 13:04:04 2009 +0200
v3-4-ctdb: Bump the ctdb verdor patch level to 9.
commit 37362895503a11433ee7005a95db1e5d77192361
Author: Martin Schwenke mar...@meltin.net
Date: Thu Oct 22 13:03:20 2009 +0200
cluster_fatal() exit code should not indicate success.
cluster_fatal() logs a fatal event and then exits with 0. This seems
wrong. Sometimes command like net use this code and return
incorrect empty output but then exit with 0.
This simply changes the exit code to 1.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
source3/VERSION |2 +-
source3/lib/ctdbd_conn.c |2 +-
source3/lib/dbwrap_ctdb.c |6 ++
3 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/VERSION b/source3/VERSION
index 2945107..96f9b2e 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -85,7 +85,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=no
# #
SAMBA_VERSION_VENDOR_SUFFIX=ctdb
-SAMBA_VERSION_VENDOR_PATCH=8
+SAMBA_VERSION_VENDOR_PATCH=9
# This can be set by vendors if they want..#
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index dde3775..d34d23e 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -57,7 +57,7 @@ static void cluster_fatal(const char *why)
a core file. We need to release this process id immediately
so that someone else can take over without getting sharing
violations */
- _exit(0);
+ _exit(1);
}
/*
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index f492d5f..8337877 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -23,6 +23,10 @@
#include ctdb_private.h
#include ctdbd_conn.h
+struct db_ctdb_transaction_record {
+ TDB_DATA key, data;
+};
+
struct db_ctdb_transaction_handle {
struct db_ctdb_ctx *ctx;
bool in_replay;
@@ -33,6 +37,8 @@ struct db_ctdb_transaction_handle {
struct ctdb_marshall_buffer *m_write;
uint32_t nesting;
bool nested_cancel;
+
+ struct db_ctdb_transaction_record *transaction_records;
};
struct db_ctdb_ctx {
--
SAMBA-CTDB repository
[SCM] SAMBA-CTDB repository - tag 3.4.2-ctdb-9 created - 9442e256ce46ab4c80883a7a2fb793d4ea1f7010
The tag, 3.4.2-ctdb-9 has been created at 9442e256ce46ab4c80883a7a2fb793d4ea1f7010 (commit) - Log - commit 9442e256ce46ab4c80883a7a2fb793d4ea1f7010 Author: Volker Lendecke v...@samba.org Date: Thu Oct 22 13:04:04 2009 +0200 v3-4-ctdb: Bump the ctdb verdor patch level to 9. --- -- SAMBA-CTDB repository
[SCM] Samba Shared Repository - branch v3-4-stable updated
The branch, v3-4-stable has been updated via b42a0db... s3:docs: Public is not a synonym for access based shareenum. via 10bd0b5... s3: Fix crash in pam_winbind, another reference to freed memory. via 00c42f09.. Fix bug 6829 - smbclient does not show special characters properly. All successful calls to cli_session_setup() *must* be followed by calls to cli_init_creds() to stash the credentials we successfully connected with. There were 2 codepaths where this was missing. This caused smbclient to be unable to open the \srvsvc pipe to do an RPC netserverenum, and cause it to fall back to a RAP netserverenum, which uses DOS codepage conversion rather than the full UCS2 of RPC, so the returned characters were not correct (unless the DOS codepage was set correctly). Phew. That was fun to track down :-). Includes logic simplification in libsmb_server.c Jeremy. (cherry picked from commit 587ca743bf1491e97c984ce4bec5a9bd0a1ae69a) via 6cbf9e8... Fix bug 6828 - infinite timeout occurs when byte lock held outside of samba Jeremy. (cherry picked from commit a572c28ca3daa199d78fc340819c5c9ff53a3ed6) via 4cdb4ae... s3: Don't fail authentication when one or some group of require-membership-of is invalid. from 470f322... WHATSNEW: Update changes since 3.4.2. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable - Log - commit b42a0dbc996d8e40b4893b11445435a781de4afa Author: Karolin Seeger ksee...@samba.org Date: Mon Oct 26 10:14:51 2009 +0100 s3:docs: Public is not a synonym for access based shareenum. Fix build warning. Karolin (cherry picked from commit 35dc481289c28a77f354dd76193d6298de32c66d) (cherry picked from commit 7601427a2db1263b0192c1a78d8bacb7eb0b74da) (cherry picked from commit d6ecfb23cfc841ad0bfe8ae677ddbbba7fd36f31) commit 10bd0b5e0dcc25f4e6803ca3507b3b09a85f378c Author: Bo Yang boy...@samba.org Date: Sat Oct 24 09:20:00 2009 +0800 s3: Fix crash in pam_winbind, another reference to freed memory. Fix bug #6840. Signed-off-by: Bo Yang boy...@samba.org (cherry picked from commit b9a3f1dd85d168c15df846dba525f4f882d1acf8) (cherry picked from commit a0fbf067011ae50d63c6ed2a79f1ff00c2ce2d11) commit 00c42f0981a10144dc78b86336f5d5177780a4bd Author: Jeremy Allison j...@samba.org Date: Thu Oct 22 15:30:47 2009 -0700 Fix bug 6829 - smbclient does not show special characters properly. All successful calls to cli_session_setup() *must* be followed by calls to cli_init_creds() to stash the credentials we successfully connected with. There were 2 codepaths where this was missing. This caused smbclient to be unable to open the \srvsvc pipe to do an RPC netserverenum, and cause it to fall back to a RAP netserverenum, which uses DOS codepage conversion rather than the full UCS2 of RPC, so the returned characters were not correct (unless the DOS codepage was set correctly). Phew. That was fun to track down :-). Includes logic simplification in libsmb_server.c Jeremy. (cherry picked from commit 587ca743bf1491e97c984ce4bec5a9bd0a1ae69a) commit 6cbf9e806644021aef4ad0d1d97c97e1e972e18e Author: Jeremy Allison j...@samba.org Date: Tue Oct 20 18:10:30 2009 -0700 Fix bug 6828 - infinite timeout occurs when byte lock held outside of samba Jeremy. (cherry picked from commit a572c28ca3daa199d78fc340819c5c9ff53a3ed6) commit 4cdb4ae29289ef17ad21871f989f18983bc75d36 Author: Bo Yang boy...@samba.org Date: Thu Oct 15 06:23:48 2009 +0800 s3: Don't fail authentication when one or some group of require-membership-of is invalid. Signed-off-by: Bo Yang boy...@samba.org (cherry picked from commit 31f1a36901b5b8959dc51401c09c114829b50392) Fix bug #6826. (cherry picked from commit f383e5f549f9f2075a064ba3d88fa9b34c5e3389) --- Summary of changes: .../smbdotconf/security/accessbasedshareenum.xml |1 - nsswitch/pam_winbind.c | 35 +--- source3/libsmb/clidfs.c|9 + source3/libsmb/libsmb_server.c |8 source3/smbd/blocking.c| 26 ++ 5 files changed, 65 insertions(+), 14 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/security/accessbasedshareenum.xml b/docs-xml/smbdotconf/security/accessbasedshareenum.xml index c2977c4..8b94648 100644 --- a/docs-xml/smbdotconf/security/accessbasedshareenum.xml +++ b/docs-xml/smbdotconf/security/accessbasedshareenum.xml @@ -3,7 +3,6 @@ context=S basic=1 advanced=1 developer=1 xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; - synonympublic/synonym description paraIf this parameter is constantyes/constant for a service,
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via 5158bdc... WHATSNEW: Update release notes. from d6ecfb2... s3:docs: Public is not a synonym for access based shareenum. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 5158bdcc222cb38b7cf4939e09f6d0fbb7868de2 Author: Karolin Seeger ksee...@samba.org Date: Mon Oct 26 12:02:40 2009 +0100 WHATSNEW: Update release notes. Karolin --- Summary of changes: WHATSNEW.txt | 11 ++- 1 files changed, 10 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 9f302aa..eef1c15 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ = Release Notes for Samba 3.4.3 -October , 2009 +October 29, 2009 = @@ -29,6 +29,8 @@ o Jeremy Allison j...@samba.org * BUG 6781: Fix renaming subfolders in Explorer view. * BUG 6793: Fix Winbind crash with INTERNAL ERROR: Signal 6. * BUG 6796: Deleting an event context on shutdown can cause smbd to crash. +* BUG 6828: Fix infinite timeout when byte lock held outside of Samba. +* BUG 6829: Fix displaying of multibyte characters in smbclient. o Günther Deschner g...@samba.org @@ -95,6 +97,10 @@ o Shirish Pargaonkar shirishpargaon...@gmail.com a symbolic link. +o Karolin Seeger ksee...@samba.org +* Fix warning occuring when building the manpages. + + o Simo Sorce sso...@redhat.com * BUG 6764: Fix timeval calculation. @@ -103,6 +109,9 @@ o Bo Yang boy...@samba.org * BUG 6735: Don't overwrite password in pam_winbind, subsequent pam modules might use the old password and new password. * BUG 6811: Fix reference to freed memory in pam_winbind. +* BUG 6826: Don't fail authentication when one or some group of + require-membership-of is invalid. +* BUG 6840: Fix crash in pam_winbind. ## -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-stable updated
The branch, v3-4-stable has been updated via 4e475de... WHATSNEW: Update release notes. from b42a0db... s3:docs: Public is not a synonym for access based shareenum. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable - Log - commit 4e475de9c1c2ed5a094a556310fcbfe955b4c884 Author: Karolin Seeger ksee...@samba.org Date: Mon Oct 26 12:02:40 2009 +0100 WHATSNEW: Update release notes. Karolin (cherry picked from commit 5158bdcc222cb38b7cf4939e09f6d0fbb7868de2) --- Summary of changes: WHATSNEW.txt | 11 ++- 1 files changed, 10 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 9f302aa..eef1c15 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ = Release Notes for Samba 3.4.3 -October , 2009 +October 29, 2009 = @@ -29,6 +29,8 @@ o Jeremy Allison j...@samba.org * BUG 6781: Fix renaming subfolders in Explorer view. * BUG 6793: Fix Winbind crash with INTERNAL ERROR: Signal 6. * BUG 6796: Deleting an event context on shutdown can cause smbd to crash. +* BUG 6828: Fix infinite timeout when byte lock held outside of Samba. +* BUG 6829: Fix displaying of multibyte characters in smbclient. o Günther Deschner g...@samba.org @@ -95,6 +97,10 @@ o Shirish Pargaonkar shirishpargaon...@gmail.com a symbolic link. +o Karolin Seeger ksee...@samba.org +* Fix warning occuring when building the manpages. + + o Simo Sorce sso...@redhat.com * BUG 6764: Fix timeval calculation. @@ -103,6 +109,9 @@ o Bo Yang boy...@samba.org * BUG 6735: Don't overwrite password in pam_winbind, subsequent pam modules might use the old password and new password. * BUG 6811: Fix reference to freed memory in pam_winbind. +* BUG 6826: Don't fail authentication when one or some group of + require-membership-of is invalid. +* BUG 6840: Fix crash in pam_winbind. ## -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f381faa... s3: Rename new parameter ldap ref follow to ldap
follow referral.
from 35dc481... s3:docs: Public is not a synonym for access based
shareenum.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f381faa8d6fc2c4205e7d59c91f00324f70ca8b9
Author: Karolin Seeger ksee...@samba.org
Date: Mon Oct 26 12:11:59 2009 +0100
s3: Rename new parameter ldap ref follow to ldap follow referral.
This parameter will be introduced with Samba 3.5.0.
Karolin
---
Summary of changes:
.../{ldapreffollow.xml = ldapfollowreferral.xml} |2 +-
source3/include/proto.h|2 +-
source3/lib/smbldap.c |4 ++--
source3/param/loadparm.c | 10 +-
4 files changed, 9 insertions(+), 9 deletions(-)
rename docs-xml/smbdotconf/ldap/{ldapreffollow.xml = ldapfollowreferral.xml}
(90%)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/ldap/ldapreffollow.xml
b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
similarity index 90%
rename from docs-xml/smbdotconf/ldap/ldapreffollow.xml
rename to docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
index f059f15..4c43b5b 100644
--- a/docs-xml/smbdotconf/ldap/ldapreffollow.xml
+++ b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
@@ -1,4 +1,4 @@
-samba:parameter name=ldap ref follow context=G type=enum
+samba:parameter name=ldap follow referral context=G type=enum
advanced=1 developer=1
xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4f33a4a..dd87ef0 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3985,7 +3985,7 @@ char *lp_ldap_suffix(void);
char *lp_ldap_admin_dn(void);
int lp_ldap_ssl(void);
bool lp_ldap_ssl_ads(void);
-int lp_ldap_ref_follow(void);
+int lp_ldap_follow_referral(void);
int lp_ldap_passwd_sync(void);
bool lp_ldap_delete_dn(void);
int lp_ldap_replication_sleep(void);
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 7287e3d..f7ca1c1 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -724,9 +724,9 @@ int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
return rc;
}
- if (lp_ldap_ref_follow() != Auto) {
+ if (lp_ldap_follow_referral() != Auto) {
rc = ldap_set_option(*ldap_struct, LDAP_OPT_REFERRALS,
-lp_ldap_ref_follow() ? LDAP_OPT_ON : LDAP_OPT_OFF);
+lp_ldap_follow_referral() ? LDAP_OPT_ON : LDAP_OPT_OFF);
if (rc != LDAP_SUCCESS)
DEBUG(0, (Failed to set LDAP_OPT_REFERRALS: %s\n,
ldap_err2string(rc)));
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index fa0577b..049b5e9 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -260,7 +260,7 @@ struct global {
char *szLdapGroupSuffix;
int ldap_ssl;
bool ldap_ssl_ads;
- int ldap_ref_follow;
+ int ldap_follow_referral;
char *szLdapSuffix;
char *szLdapAdminDn;
int ldap_debug_level;
@@ -3672,10 +3672,10 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
- .label = ldap ref follow,
+ .label = ldap follow referral,
.type = P_ENUM,
.p_class= P_GLOBAL,
- .ptr= Globals.ldap_ref_follow,
+ .ptr= Globals.ldap_follow_referral,
.special= NULL,
.enum_list = enum_bool_auto,
.flags = FLAG_ADVANCED,
@@ -5052,7 +5052,7 @@ static void init_globals(bool first_time_only)
Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
Globals.ldap_delete_dn = False;
Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
- Globals.ldap_ref_follow = Auto;
+ Globals.ldap_follow_referral = Auto;
Globals.ldap_timeout = LDAP_DEFAULT_TIMEOUT;
Globals.ldap_connection_timeout = LDAP_CONNECTION_DEFAULT_TIMEOUT;
Globals.ldap_page_size = LDAP_PAGE_SIZE;
@@ -5402,7 +5402,7 @@ FN_GLOBAL_STRING(lp_ldap_suffix, Globals.szLdapSuffix)
FN_GLOBAL_STRING(lp_ldap_admin_dn, Globals.szLdapAdminDn)
FN_GLOBAL_INTEGER(lp_ldap_ssl, Globals.ldap_ssl)
FN_GLOBAL_BOOL(lp_ldap_ssl_ads, Globals.ldap_ssl_ads)
-FN_GLOBAL_INTEGER(lp_ldap_ref_follow, Globals.ldap_ref_follow)
+FN_GLOBAL_INTEGER(lp_ldap_follow_referral, Globals.ldap_follow_referral)
FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, Globals.ldap_passwd_sync)
FN_GLOBAL_BOOL(lp_ldap_delete_dn, Globals.ldap_delete_dn)
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 7e08fa0... s3: Rename new parameter ldap ref follow to ldap
follow referral.
from 7601427... s3:docs: Public is not a synonym for access based
shareenum.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 7e08fa0ddbe591611a32cf44a7cbd944c8afe9a4
Author: Karolin Seeger ksee...@samba.org
Date: Mon Oct 26 12:11:59 2009 +0100
s3: Rename new parameter ldap ref follow to ldap follow referral.
This parameter will be introduced with Samba 3.5.0.
Karolin
(cherry picked from commit f381faa8d6fc2c4205e7d59c91f00324f70ca8b9)
---
Summary of changes:
.../{ldapreffollow.xml = ldapfollowreferral.xml} |2 +-
source3/include/proto.h|2 +-
source3/lib/smbldap.c |4 ++--
source3/param/loadparm.c | 10 +-
4 files changed, 9 insertions(+), 9 deletions(-)
rename docs-xml/smbdotconf/ldap/{ldapreffollow.xml = ldapfollowreferral.xml}
(90%)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/ldap/ldapreffollow.xml
b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
similarity index 90%
rename from docs-xml/smbdotconf/ldap/ldapreffollow.xml
rename to docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
index f059f15..4c43b5b 100644
--- a/docs-xml/smbdotconf/ldap/ldapreffollow.xml
+++ b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
@@ -1,4 +1,4 @@
-samba:parameter name=ldap ref follow context=G type=enum
+samba:parameter name=ldap follow referral context=G type=enum
advanced=1 developer=1
xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6f81162..3da5768 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3985,7 +3985,7 @@ char *lp_ldap_suffix(void);
char *lp_ldap_admin_dn(void);
int lp_ldap_ssl(void);
bool lp_ldap_ssl_ads(void);
-int lp_ldap_ref_follow(void);
+int lp_ldap_follow_referral(void);
int lp_ldap_passwd_sync(void);
bool lp_ldap_delete_dn(void);
int lp_ldap_replication_sleep(void);
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 7287e3d..f7ca1c1 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -724,9 +724,9 @@ int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
return rc;
}
- if (lp_ldap_ref_follow() != Auto) {
+ if (lp_ldap_follow_referral() != Auto) {
rc = ldap_set_option(*ldap_struct, LDAP_OPT_REFERRALS,
-lp_ldap_ref_follow() ? LDAP_OPT_ON : LDAP_OPT_OFF);
+lp_ldap_follow_referral() ? LDAP_OPT_ON : LDAP_OPT_OFF);
if (rc != LDAP_SUCCESS)
DEBUG(0, (Failed to set LDAP_OPT_REFERRALS: %s\n,
ldap_err2string(rc)));
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index fa0577b..049b5e9 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -260,7 +260,7 @@ struct global {
char *szLdapGroupSuffix;
int ldap_ssl;
bool ldap_ssl_ads;
- int ldap_ref_follow;
+ int ldap_follow_referral;
char *szLdapSuffix;
char *szLdapAdminDn;
int ldap_debug_level;
@@ -3672,10 +3672,10 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
- .label = ldap ref follow,
+ .label = ldap follow referral,
.type = P_ENUM,
.p_class= P_GLOBAL,
- .ptr= Globals.ldap_ref_follow,
+ .ptr= Globals.ldap_follow_referral,
.special= NULL,
.enum_list = enum_bool_auto,
.flags = FLAG_ADVANCED,
@@ -5052,7 +5052,7 @@ static void init_globals(bool first_time_only)
Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
Globals.ldap_delete_dn = False;
Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
- Globals.ldap_ref_follow = Auto;
+ Globals.ldap_follow_referral = Auto;
Globals.ldap_timeout = LDAP_DEFAULT_TIMEOUT;
Globals.ldap_connection_timeout = LDAP_CONNECTION_DEFAULT_TIMEOUT;
Globals.ldap_page_size = LDAP_PAGE_SIZE;
@@ -5402,7 +5402,7 @@ FN_GLOBAL_STRING(lp_ldap_suffix, Globals.szLdapSuffix)
FN_GLOBAL_STRING(lp_ldap_admin_dn, Globals.szLdapAdminDn)
FN_GLOBAL_INTEGER(lp_ldap_ssl, Globals.ldap_ssl)
FN_GLOBAL_BOOL(lp_ldap_ssl_ads, Globals.ldap_ssl_ads)
-FN_GLOBAL_INTEGER(lp_ldap_ref_follow, Globals.ldap_ref_follow)
+FN_GLOBAL_INTEGER(lp_ldap_follow_referral, Globals.ldap_follow_referral)
FN_GLOBAL_INTEGER(lp_ldap_passwd_sync,
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 855430f... WHATSNEW: Update changes. from 7e08fa0... s3: Rename new parameter ldap ref follow to ldap follow referral. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 855430fcb9a950faa711d586d9ef78abb9a698a7 Author: Karolin Seeger ksee...@samba.org Date: Mon Oct 26 12:16:31 2009 +0100 WHATSNEW: Update changes. Karolin --- Summary of changes: WHATSNEW.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index dbf8e16..6f4b159 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -22,7 +22,7 @@ smb.conf changes -- --- --- create krb5 conf New yes - ldap ref followNew auto + ldap follow referral New auto store create time New no -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6afac82... s4-ldb: '+' can also happen in base64 encoded index DNs
via 8ae0abc... s4:ldb Add detail to failures in the indexing code
via 5e920f2... s4:dsdb Rework partitions module for better tracing
via 3c6c230... s4:ldb Add additional tracing of the ldb API
via 53b160e... s4:dsdb Remove partition_extended_schema_update_now
from f381faa... s3: Rename new parameter ldap ref follow to ldap
follow referral.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6afac82e4b2e09262cf3151bc87a82c5abb39932
Author: Andrew Tridgell tri...@samba.org
Date: Tue Oct 27 11:44:05 2009 +1100
s4-ldb: '+' can also happen in base64 encoded index DNs
commit 8ae0abc65f9023d031c799516efe52cb36c612f5
Author: Andrew Bartlett abart...@samba.org
Date: Tue Oct 27 11:10:49 2009 +1100
s4:ldb Add detail to failures in the indexing code
commit 5e920f2a232ea0bce366895b0b789b1362e88180
Author: Andrew Bartlett abart...@samba.org
Date: Tue Oct 27 10:54:16 2009 +1100
s4:dsdb Rework partitions module for better tracing
This means we need to create a fake 'module' which only has a 'next'
pointer, so that we can now ldb_next_request() (which incorporates
tracing). The remainaing stub of partition_request() is retained so
that we can indicate which partition an operation is destined for.
Similar tracing is added to the transaction handlers.
Andrew Bartlett
commit 3c6c230b2d5c8a2632163a5f11d9e3f1f3db1639
Author: Andrew Bartlett abart...@samba.org
Date: Tue Oct 27 10:43:51 2009 +1100
s4:ldb Add additional tracing of the ldb API
This helps pin down where errors occour, by printing a call stack and
setting error strings and trace messages in the transaction case.
Andrew Bartlett
commit 53b160e1b80f66b0728020783df5bf433048a148
Author: Andrew Bartlett abart...@samba.org
Date: Mon Oct 26 10:23:10 2009 +1100
s4:dsdb Remove partition_extended_schema_update_now
The schema update now request is now handled above the partitions
module.
Andrew Bartlett
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/partition.c | 173 +++---
source4/dsdb/samdb/ldb_modules/partition.h | 13 --
source4/dsdb/samdb/ldb_modules/partition_init.c | 38 +++---
source4/lib/ldb/common/ldb.c| 20 +++
source4/lib/ldb/common/ldb_dn.c |2 +-
source4/lib/ldb/common/ldb_modules.c| 64 -
source4/lib/ldb/ldb_tdb/ldb_index.c | 10 +-
7 files changed, 165 insertions(+), 155 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c
b/source4/dsdb/samdb/ldb_modules/partition.c
index 587d920..a36ab3a 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -68,48 +68,23 @@ static struct partition_context *partition_init_ctx(struct
ldb_module *module, s
int partition_request(struct ldb_module *module, struct ldb_request *request)
{
- int ret;
- switch (request-operation) {
- case LDB_SEARCH:
- PARTITION_FIND_OP(module, search);
- ret = module-ops-search(module, request);
- break;
- case LDB_ADD:
- PARTITION_FIND_OP(module, add);
- ret = module-ops-add(module, request);
- break;
- case LDB_MODIFY:
- PARTITION_FIND_OP(module, modify);
- ret = module-ops-modify(module, request);
- break;
- case LDB_DELETE:
- PARTITION_FIND_OP(module, del);
- ret = module-ops-del(module, request);
- break;
- case LDB_RENAME:
- PARTITION_FIND_OP(module, rename);
- ret = module-ops-rename(module, request);
- break;
- case LDB_EXTENDED:
- PARTITION_FIND_OP(module, extended);
- ret = module-ops-extended(module, request);
- break;
- default:
- PARTITION_FIND_OP(module, request);
- ret = module-ops-request(module, request);
- break;
- }
- if (ret == LDB_SUCCESS) {
- return ret;
- }
- if (!ldb_errstring(ldb_module_get_ctx(module))) {
- /* Set a default error string, to place the blame somewhere */
- ldb_asprintf_errstring(ldb_module_get_ctx(module),
- error in module %s: %s (%d),
- module-ops-name,
- ldb_strerror(ret), ret);
+ if ((module module-ldb-flags LDB_FLG_ENABLE_TRACING)) { \
+ const struct
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ab4d069... s4-dsdb: always cancel transactions on all partitions
from 6afac82... s4-ldb: '+' can also happen in base64 encoded index DNs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ab4d06909498c2fa7b22e6abcf7705aa807d0bf4
Author: Andrew Tridgell tri...@samba.org
Date: Tue Oct 27 12:13:46 2009 +1100
s4-dsdb: always cancel transactions on all partitions
If we get an error ending a transaction on one partition we need to
continue on the other partitions.
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/partition.c | 32 ---
1 files changed, 19 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c
b/source4/dsdb/samdb/ldb_modules/partition.c
index a36ab3a..01ae0a1 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -703,33 +703,39 @@ static int partition_prepare_commit(struct ldb_module
*module)
/* end a transaction */
static int partition_end_trans(struct ldb_module *module)
{
- int i;
+ int i, ret, ret2;
struct partition_private_data *data =
talloc_get_type(module-private_data,
struct
partition_private_data);
- for (i=0; data data-partitions data-partitions[i]; i++) {
- int ret;
+ ret = LDB_SUCCESS;
+
+ if (data-in_transaction == 0) {
+ DEBUG(0,(partition end transaction mismatch\n));
+ ret = LDB_ERR_OPERATIONS_ERROR;
+ } else {
+ data-in_transaction--;
+ }
+
+ for (i=0; data data-partitions data-partitions[i]; i++) {
if ((module module-ldb-flags LDB_FLG_ENABLE_TRACING)) {
ldb_debug(module-ldb, LDB_DEBUG_TRACE,
partition_end_trans() - %s,
ldb_dn_get_linearized(data-partitions[i]-ctrl-dn));
}
- ret = ldb_next_end_trans(data-partitions[i]-module);
- if (ret != LDB_SUCCESS) {
+ ret2 = ldb_next_end_trans(data-partitions[i]-module);
+ if (ret2 != LDB_SUCCESS) {
ldb_asprintf_errstring(module-ldb, end_trans error on
%s: %s, ldb_dn_get_linearized(data-partitions[i]-ctrl-dn),
ldb_errstring(module-ldb));
- return ret;
+ ret = ret2;
}
}
- if (data-in_transaction == 0) {
- DEBUG(0,(partition end transaction mismatch\n));
- return LDB_ERR_OPERATIONS_ERROR;
- }
- data-in_transaction--;
-
if ((module module-ldb-flags LDB_FLG_ENABLE_TRACING)) {
ldb_debug(module-ldb, LDB_DEBUG_TRACE, partition_end_trans()
- (metadata partition));
}
- return ldb_next_end_trans(module);
+ ret2 = ldb_next_end_trans(module);
+ if (ret2 != LDB_SUCCESS) {
+ ret = ret2;
+ }
+ return ret;
}
/* delete a transaction */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9a2112e... Second part of the fix for bug 6828 - infinite timeout
occurs when byte lock held outside of samba. Fixes case where a connection with
a pending lock can me marked idle, and ensures that the lock queue timeout is
always recalculated. Jeremy.
from ab4d069... s4-dsdb: always cancel transactions on all partitions
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9a2112ec6604bb9d2c9cf9a99ee42e3e19d209db
Author: Jeremy Allison j...@samba.org
Date: Mon Oct 26 21:20:22 2009 -0700
Second part of the fix for bug 6828 - infinite timeout occurs when byte
lock held outside of samba.
Fixes case where a connection with a pending lock can me marked idle, and
ensures
that the lock queue timeout is always recalculated.
Jeremy.
---
Summary of changes:
source3/smbd/blocking.c | 15 +--
1 files changed, 9 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 01d9ca8..deb7f8f 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -652,7 +652,6 @@ void process_blocking_lock_queue(void)
{
struct timeval tv_curr = timeval_current();
struct blocking_lock_record *blr, *next = NULL;
- bool recalc_timeout = False;
/*
* Go through the queue and see if we can get any of the locks.
@@ -670,6 +669,14 @@ void process_blocking_lock_queue(void)
DEBUG(10, (Processing BLR = %p\n, blr));
+ /* We use set_current_service so connections with
+* pending locks are not marked as idle.
+*/
+
+ set_current_service(blr-fsp-conn,
+ SVAL(blr-req-inbuf,smb_flg),
+ false);
+
if(blocking_lock_record_process(blr)) {
struct byte_range_lock *br_lck = brl_get_locks(
talloc_tos(), blr-fsp);
@@ -690,7 +697,6 @@ void process_blocking_lock_queue(void)
DLIST_REMOVE(blocking_lock_queue, blr);
TALLOC_FREE(blr);
- recalc_timeout = True;
continue;
}
@@ -729,13 +735,10 @@ void process_blocking_lock_queue(void)
blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
DLIST_REMOVE(blocking_lock_queue, blr);
TALLOC_FREE(blr);
- recalc_timeout = True;
}
}
- if (recalc_timeout) {
- recalc_brl_timeout();
- }
+ recalc_brl_timeout();
}
/
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via b3bb185... Second part of the fix for bug 6828 - infinite timeout
occurs when byte lock held outside of samba. Fixes case where a connection with
a pending lock can me marked idle, and ensures that the lock queue timeout is
always recalculated. Jeremy.
from 855430f... WHATSNEW: Update changes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit b3bb18554d4e414fb960b8d043af464c8b4ac43a
Author: Jeremy Allison j...@samba.org
Date: Mon Oct 26 21:20:22 2009 -0700
Second part of the fix for bug 6828 - infinite timeout occurs when byte
lock held outside of samba.
Fixes case where a connection with a pending lock can me marked idle, and
ensures
that the lock queue timeout is always recalculated.
Jeremy.
---
Summary of changes:
source3/smbd/blocking.c | 15 +--
1 files changed, 9 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 01d9ca8..deb7f8f 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -652,7 +652,6 @@ void process_blocking_lock_queue(void)
{
struct timeval tv_curr = timeval_current();
struct blocking_lock_record *blr, *next = NULL;
- bool recalc_timeout = False;
/*
* Go through the queue and see if we can get any of the locks.
@@ -670,6 +669,14 @@ void process_blocking_lock_queue(void)
DEBUG(10, (Processing BLR = %p\n, blr));
+ /* We use set_current_service so connections with
+* pending locks are not marked as idle.
+*/
+
+ set_current_service(blr-fsp-conn,
+ SVAL(blr-req-inbuf,smb_flg),
+ false);
+
if(blocking_lock_record_process(blr)) {
struct byte_range_lock *br_lck = brl_get_locks(
talloc_tos(), blr-fsp);
@@ -690,7 +697,6 @@ void process_blocking_lock_queue(void)
DLIST_REMOVE(blocking_lock_queue, blr);
TALLOC_FREE(blr);
- recalc_timeout = True;
continue;
}
@@ -729,13 +735,10 @@ void process_blocking_lock_queue(void)
blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
DLIST_REMOVE(blocking_lock_queue, blr);
TALLOC_FREE(blr);
- recalc_timeout = True;
}
}
- if (recalc_timeout) {
- recalc_brl_timeout();
- }
+ recalc_brl_timeout();
}
/
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - 1.0.99-34-g4037b6e
The branch, master has been updated
via 4037b6e73a819a8e2463dfe0959b42875e05e106 (commit)
via 227fe99f105bdc3a4f1000f238cbe3adeb3f22f0 (commit)
via cc30ee2f4f33cb75b2be980c2d4dff6c7c23852f (commit)
via a10fc51f4c30e85ada6d4b7347b0f9a8ebc76637 (commit)
from 20678e1506db1f96b58c326ee91339e797c07c22 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 4037b6e73a819a8e2463dfe0959b42875e05e106
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Oct 27 15:45:03 2009 +1100
add a check that winbind can actually talk to teh dc during the startup
event
and refuse to start up if it can not
commit 227fe99f105bdc3a4f1000f238cbe3adeb3f22f0
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Oct 27 15:17:45 2009 +1100
temporarily try allowing clients to attach to databases even if the node is
banned/stopped or inactive in any other way.
commit cc30ee2f4f33cb75b2be980c2d4dff6c7c23852f
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Oct 27 13:51:45 2009 +1100
dont run the monitor event so frequently after a event has failed.
use _exit() instead of exit() when terminating an eventscript.
commit a10fc51f4c30e85ada6d4b7347b0f9a8ebc76637
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Oct 27 13:18:52 2009 +1100
for debugging
add a global variable holding the pid of the main daemon.
change the tracking of time() in the event loop to only check/warn when
called from the main daemon
---
Summary of changes:
client/ctdb_client.c |2 ++
config/events.d/50.samba |4
include/ctdb_private.h |5 +
lib/events/events_epoll.c| 22 +-
lib/events/events_select.c | 22 +-
lib/events/events_standard.c | 22 +-
server/ctdb_daemon.c |4 +++-
server/ctdb_ltdb_server.c| 25 ++---
server/ctdb_monitor.c|4 ++--
server/eventscript.c |2 +-
tools/ctdb.c |1 -
11 files changed, 70 insertions(+), 43 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index e8c543f..d4130cd 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -30,6 +30,8 @@
#include ../include/ctdb_private.h
#include lib/util/dlinklist.h
+pid_t ctdbd_pid;
+
/*
allocate a packet for use in client-daemon communication
*/
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 814fb9a..1785f4d 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -171,6 +171,10 @@ case $cmd in
killall -q -9 winbindd
}
service $CTDB_SERVICE_WINBIND start
+ wbinfo -t || {
+ echo Startup failed. wbinfo -t returned error.
+ exit 1
+ }
}
# start Samba service. Start it reniced, as under very heavy load
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index ad84628..e73913a 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -54,6 +54,11 @@ struct takeover_run_reply {
};
/*
+ * pid of the ctdbd daemon
+ */
+extern pid_t ctdbd_pid;
+
+/*
a tcp connection description
*/
struct ctdb_tcp_connection {
diff --git a/lib/events/events_epoll.c b/lib/events/events_epoll.c
index b7172a7..0dfdb79 100644
--- a/lib/events/events_epoll.c
+++ b/lib/events/events_epoll.c
@@ -29,6 +29,8 @@
#include lib/events/events_internal.h
#include sys/epoll.h
+extern pid_t ctdbd_pid;
+
struct epoll_event_context {
/* a pointer back to the generic event_context */
struct event_context *ev;
@@ -466,17 +468,19 @@ static int epoll_event_loop_wait(struct event_context *ev)
if (epoll_event_loop_once(ev) != 0) {
break;
}
- new_t=time(NULL);
- if (t != 0) {
- if (t new_t) {
- DEBUG(0,(ERROR Time skipped backward by %d
seconds\n, (int)(t-new_t)));
- }
- /* We assume here that we get at least one event every
5 seconds */
- if (new_t (t+5)) {
- DEBUG(0,(ERROR Time jumped forward by %d
seconds\n, (int)(new_t-t)));
+ if (getpid() == ctdbd_pid) {
+ new_t=time(NULL);
+ if (t != 0) {
+ if (t new_t) {
+ DEBUG(0,(ERROR Time skipped backward
by %d seconds\n, (int)(t-new_t)));
+ }
+ /* We assume here that we get at least one
event every 5 seconds
