[SCM] CTDB repository - branch 2.5 updated - ctdb-2.5.3-87-g096ffd1
The branch, 2.5 has been updated
via 096ffd1e9ba2f869f79c934fe2b68d0bbd097e14 (commit)
from 99ce67c7caa78baaa48fdd43919ab8e03207e1e9 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=2.5
- Log -
commit 096ffd1e9ba2f869f79c934fe2b68d0bbd097e14
Author: Amitay Isaacs
Date: Mon Jul 14 16:30:18 2014 +1000
ltdb: Use tdb_null instead of zeroing TDB_DATA variable
Signed-off-by: Amitay Isaacs
Reviewed-by: Volker Lendecke
Autobuild-User(master): Volker Lendecke
Autobuild-Date(master): Mon Jul 14 16:01:31 CEST 2014 on sn-devel-104
(Imported from commit 208b2d88c4efacee79fe4d856ee8256c680cad5c)
---
Summary of changes:
common/ctdb_ltdb.c |6 ++
1 files changed, 2 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/common/ctdb_ltdb.c b/common/ctdb_ltdb.c
index 500f721..103d89b 100644
--- a/common/ctdb_ltdb.c
+++ b/common/ctdb_ltdb.c
@@ -83,7 +83,6 @@ int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
rec = tdb_fetch(ctdb_db->ltdb->tdb, key);
if (rec.dsize < sizeof(*header)) {
- TDB_DATA d2;
/* return an initial header */
if (rec.dptr) free(rec.dptr);
if (ctdb->vnn_map == NULL) {
@@ -93,12 +92,11 @@ int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
return -1;
}
ltdb_initial_header(ctdb_db, key, header);
- ZERO_STRUCT(d2);
if (data) {
- *data = d2;
+ *data = tdb_null;
}
if (ctdb_db->persistent || header->dmaster ==
ctdb_db->ctdb->pnn) {
- if (ctdb_ltdb_store(ctdb_db, key, header, d2) != 0) {
+ if (ctdb_ltdb_store(ctdb_db, key, header, tdb_null) !=
0) {
DEBUG(DEBUG_NOTICE,
(__location__ "failed to store initial
header\n"));
}
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 776c7ed samlogon_cache: avoid overwriting info3->base.full_name.string. via e0128fd samlogon_cache: use a talloc_stackframe inside netsamlogon_cache_store. via 2a790a5 s3-winbindd: prefer "displayName" over "name" in ads user queries for the fullname. via 403693f s3-winbind: Don't set the gecos field to NULL. via 1839417 s3-winbindd: use wcache_query_user_fullname after inspecting samlogon cache. via cf0ae51 s3-winbindd: add wcache_query_user_fullname(). via c735823 s3-winbindd: call interactive samlogon via rpccli_netlogon_password_logon. via b722167 s3-rpc_client: return info3 in rpccli_netlogon_password_logon(). from 4b68871 ntlm_auth: added require-membership tests http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 776c7ed0f505be4f17d884c9ee3c40ae6c722b2a Author: Andreas Schneider Date: Thu Jul 3 16:17:46 2014 +0200 samlogon_cache: avoid overwriting info3->base.full_name.string. This field servers as a source for the gecos field. We should not overwrite it when a info3 struct from a samlogon network level gets saved in which case this field is always NULL. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10440 Signed-off-by: Andreas Schneider Reviewed-by: Guenther Deschner Autobuild-User(master): Günther Deschner Autobuild-Date(master): Tue Jul 15 18:25:28 CEST 2014 on sn-devel-104 commit e0128fd07e31b3e93c38d35731d9fc15048089d7 Author: Günther Deschner Date: Wed Jul 9 13:36:06 2014 +0200 samlogon_cache: use a talloc_stackframe inside netsamlogon_cache_store. Guenther Signed-off-by: Günther Deschner Reviewed-by: Andreas Schneider commit 2a790a5aff7beceb6af875fa6bc3b3f656765f4a Author: Günther Deschner Date: Mon Jul 14 18:22:26 2014 +0200 s3-winbindd: prefer "displayName" over "name" in ads user queries for the fullname. This makes use more consistent with security=domain as well where the gecos field is also filled using the displayName field. Guenther Signed-off-by: Guenther Deschner Pair-Programmed-With: Andreas Schneider Reviewed-by: Andreas Schneider commit 403693f228ec327ba935843cfd17aa7e4f62da63 Author: Andreas Schneider Date: Thu Jul 3 16:19:42 2014 +0200 s3-winbind: Don't set the gecos field to NULL. The value is loaded from the cache anyway. So it will be set to NULL if it is not available. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10440 Signed-off-by: Andreas Schneider Reviewed-by: Guenther Deschner commit 1839417bcc21391de9eceb406719c7281763f2a1 Author: Günther Deschner Date: Mon Jul 7 17:16:32 2014 +0200 s3-winbindd: use wcache_query_user_fullname after inspecting samlogon cache. The reason for this followup query is that very often the samlogon cache only contains a info3 netlogon user structure that has been retrieved during a netlogon samlogon authentication using "network" logon level. With that logon level only a few info3 fields are filled in; the user's fullname is never filled in that case. This is problematic when the cache is used to fill in the user's gecos field (for NSS queries). When we have retrieved the user's fullname during other queries, reuse it from the other caches. Thanks to Matt Rogers . BUG: https://bugzilla.samba.org/show_bug.cgi?id=10440 Guenther Pair-Programmed-With: Andreas Schneider Signed-off-by: Guenther Deschner Reviewed-by: Andreas Schneider commit cf0ae511ebe2a9dc3bd11d5adf60459e545157f7 Author: Günther Deschner Date: Mon Jul 7 17:14:37 2014 +0200 s3-winbindd: add wcache_query_user_fullname(). This helper function is used to query the full name of a cached user object (for further gecos processing). Thanks to Matt Rogers . BUG: https://bugzilla.samba.org/show_bug.cgi?id=10440 Guenther Pair-Programmed-With: Andreas Schneider Signed-off-by: Günther Deschner Reviewed-by: Andreas Schneider commit c735823f68ab3e0553e982ac3e5e90a7cc43db16 Author: Günther Deschner Date: Tue Jul 15 08:29:55 2014 +0200 s3-winbindd: call interactive samlogon via rpccli_netlogon_password_logon. Guenther Signed-off-by: Guenther Deschner Pair-Programmed-With: Andreas Schneider Reviewed-by: Andreas Schneider commit b722167b2c7435dbd14684261002522808eb7aaf Author: Günther Deschner Date: Tue Jul 15 08:28:42 2014 +0200 s3-rpc_client: return info3 in rpccli_netlogon_password_logon(). Guenther Signed-off-by: Günther Deschner Pair-Programmed-With: Andreas Schneider Reviewed-by: Andreas Schneider ---
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4b68871 ntlm_auth: added require-membership tests
via 6608402 torture: test_ntlm_auth.py now has a require-membership-of
argument
from ca1e4af As David Woodhouse points out, this breaks backwards
compatibility.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4b68871ae80d1834f5f5cecb0ab65ca9abb283bc
Author: Garming Sam
Date: Wed Jun 11 17:07:44 2014 +1200
ntlm_auth: added require-membership tests
(updated by abartlet to fix knownfail changes due to AD DC winbindd
use in master)
Change-Id: Iec41fbfc0f501888fd16323bf78da61aa549b4de
Signed-off-by: Garming Sam Reviewed-by:
Andrew Bartlett
Reviewed-by: Kamen Mazdrashki
Autobuild-User(master): Kamen Mazdrashki
Autobuild-Date(master): Tue Jul 15 15:59:49 CEST 2014 on sn-devel-104
commit 66084025273ee8c793e6a947f69579ec0f0a7640
Author: Garming Sam
Date: Fri Jul 4 12:50:37 2014 +1200
torture: test_ntlm_auth.py now has a require-membership-of argument
Change-Id: I90c2172af792a082fbf49ee0ab7d6eedf5471440
Signed-off-by: Garming Sam
Reviewed-by: Andrew Bartlett
Reviewed-by: Kamen Mazdrashki
---
Summary of changes:
selftest/knownfail|2 +
source3/script/tests/test_ntlm_auth_s3.sh | 74 +
source3/torture/test_ntlm_auth.py |7 +++
3 files changed, 83 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail b/selftest/knownfail
index 7d1702d..214a170 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -298,3 +298,5 @@
^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U check for sane
mapping\(s3member:local\)
^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G against
s3member\(s3member:local\)
^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G check for sane
mapping\(s3member:local\)
+^samba.ntlm_auth.\(dc:local\).ntlm_auth against winbindd with failed
require-membership-of
+^samba.ntlm_auth.\(dc:local\).ntlm_auth with NTLMSSP gss-spnego-client and
gss-spnego server against winbind with failed require-membership-of
diff --git a/source3/script/tests/test_ntlm_auth_s3.sh
b/source3/script/tests/test_ntlm_auth_s3.sh
index ca7a952..66b 100755
--- a/source3/script/tests/test_ntlm_auth_s3.sh
+++ b/source3/script/tests/test_ntlm_auth_s3.sh
@@ -19,8 +19,73 @@ ADDARGS="$*"
incdir=`dirname $0`/../../../testprogs/blackbox
. $incdir/subunit.sh
+SID=`eval $BINDIR/wbinfo -n $USERNAME | cut -d ' ' -f1`
+BADSID=`eval $BINDIR/wbinfo -n $USERNAME | cut -d ' ' -f1 | sed 's/..$//'`
+
failed=0
+test_interactive_prompt_stdout()
+{
+ tmpfile=$PREFIX/ntlm_commands
+
+ cat > $tmpfile &1
+
+ if [ $? = 0 ] ; then
+ # authenticated .. succeed
+ true
+ else
+ echo failed to get successful authentication
+ false
+ fi
+}
+
+test_interactive_prompt_stdout_fail()
+{
+ tmpfile=$PREFIX/ntlm_commands
+
+ cat > $tmpfile &1
+
+ if [ $? = 0 ] ; then
+ # failed to authenticate .. success
+ true
+ else
+ echo "incorrectly gave a successful authentication"
+ false
+ fi
+}
+
testit "ntlm_auth" $PYTHON $SRC3DIR/torture/test_ntlm_auth.py $NTLM_AUTH
$ADDARGS || failed=`expr $failed + 1`
# This should work even with NTLMv2
testit "ntlm_auth with specified domain" $PYTHON
$SRC3DIR/torture/test_ntlm_auth.py $NTLM_AUTH $ADDARGS --client-domain=fOo
--server-domain=fOo || failed=`expr $failed + 1`
@@ -30,4 +95,13 @@ testit "ntlm_auth with NTLMSSP gss-spnego-client and
gss-spnego server" $PYTHON
testit "ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server against
winbind" $PYTHON $SRC3DIR/torture/test_ntlm_auth.py $NTLM_AUTH
--client-username=$USERNAME --client-domain=$DOMAIN --client-password=$PASSWORD
--server-use-winbindd --client-helper=gss-spnego-client
--server-helper=gss-spnego $ADDARGS || failed=`expr $failed + 1`
+testit "ntlm_auth against winbindd with require-membership-of" $PYTHON
$SRC3DIR/torture/test_ntlm_auth.py $NTLM_AUTH --client-username=$USERNAME
--client-domain=$DOMAIN --client-password=$PASSWORD --server-use-winbindd
$ADDARGS --require-membership-of=$SID || failed=`expr $failed + 1`
+testit "ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server against
winbind with require-membership-of" $PYTHON $SRC3DIR/torture/test_ntlm_auth.py
$NTLM_AUTH --client-username=$USERNAME --client-domain=$DOMAIN
--client-password=$PASSWORD --server-use-winbindd
--client-helper=gss-spnego-client --server-helper=gss-spnego $ADDARGS
--require-membership-of=$SID || failed=`expr $failed + 1`
+
+testit_expect_failure "ntlm_auth against winbindd with fa
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/2014-07-15-1540/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-07-15-1540/samba.stderr http://git.samba.org/autobuild.flakey/2014-07-15-1540/samba.stdout The top commit at the time of the failure was: commit ca1e4af466af83c0f28804813dc19a77c340f981 Author: Jeremy Allison Date: Mon Jul 14 10:22:52 2014 -0700 As David Woodhouse points out, this breaks backwards compatibility. https://bugzilla.samba.org/show_bug.cgi?id=10692 Revert "libwbclient: reject unknown named blobs in wbcCredentialCache()" This reverts commit 740d12d1e77d356ff22c3725dce8d5019c86a7a5. Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Mon Jul 14 21:54:08 CEST 2014 on sn-devel-104
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated
via 7ff37ef selftest: teardown the environments also on getting SIGPIPE
via fac9504 libwbclient: allow only one initial_blob/challenge_blob in
wbcCredentialCache()
via f484138 s3: libwbclient: Don't break out of loop too soon - find
all parameters.
via 375c351 s3:smb2_read: let smb2_sendfile_send_data() behave like
send_file_readX()
from cfbd1da torture4: Make raw.lock.multilock fail after 20 seconds
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 7ff37efe2d268b6b1d438f80d0f5b73f437348ac
Author: Stefan Metzmacher
Date: Thu Jul 10 14:28:56 2014 +0200
selftest: teardown the environments also on getting SIGPIPE
make test uses
selftest.pl | subuntu-filter.py ...
FAIL_IMMEDIATELY=1 lets subuntu-filter.py exit,
which generates SIGPIPE in selftest.pl.
We should handle this just like any other signal
and teardown all environments.
This should make the teardown process more reliable/verbose.
Pair-Programmed-With: Michael Adam
Signed-off-by: Stefan Metzmacher
Signed-off-by: Michael Adam
(cherry picked from commit b2803950fc439017680069813fc49255a3f0cbbf)
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10696
backport autobuild/selftest fixes from master
Autobuild-User(v4-0-test): Karolin Seeger
Autobuild-Date(v4-0-test): Tue Jul 15 14:34:31 CEST 2014 on sn-devel-104
commit fac95046b5eeebf740284dbf1c673ad3188df8d9
Author: Stefan Metzmacher
Date: Thu Jul 10 05:28:36 2014 +0200
libwbclient: allow only one initial_blob/challenge_blob in
wbcCredentialCache()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10692
Signed-off-by: Stefan Metzmacher
Reviewed-by: Jeremy Allison
commit f484138ba90924e4e0ef24d201f903abaee709d1
Author: Jeremy Allison
Date: Tue Jul 8 16:36:30 2014 -0700
s3: libwbclient: Don't break out of loop too soon - find all parameters.
Fix bug #10692: wbcCredentialCache fails if challenge_blob is not first
https://bugzilla.samba.org/show_bug.cgi?id=10692
Signed-off-by: Jeremy Allison
commit 375c351dbe1a89f804c55d003cc17d67afd62ba9
Author: Stefan Metzmacher
Date: Thu Jul 10 21:08:06 2014 +0200
s3:smb2_read: let smb2_sendfile_send_data() behave like send_file_readX()
We now pass the header to SMB_VFS_SENDFILE(), so we have to handle that also
in the fallback code.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10706
Signed-off-by: Stefan Metzmacher
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Fri Jul 11 22:57:17 CEST 2014 on sn-devel-104
(cherry picked from commit 7c5ea400ad1f280f5c338c31a0a893154340fdb3)
---
Summary of changes:
nsswitch/libwbclient/wbc_pam.c | 30 +++--
selftest/selftest.pl | 25 +--
source3/smbd/smb2_read.c | 69 ++-
3 files changed, 87 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c
index f183cc6..ae70d67 100644
--- a/nsswitch/libwbclient/wbc_pam.c
+++ b/nsswitch/libwbclient/wbc_pam.c
@@ -1208,6 +1208,25 @@ wbcErr wbcCredentialCache(struct
wbcCredentialCacheParams *params,
goto fail;
}
+ for (i=0; inum_blobs; i++) {
+ if (strcasecmp(params->blobs[i].name, "initial_blob") == 0) {
+ if (initial_blob != NULL) {
+ status = WBC_ERR_INVALID_PARAM;
+ goto fail;
+ }
+ initial_blob = ¶ms->blobs[i];
+ continue;
+ }
+ if (strcasecmp(params->blobs[i].name, "challenge_blob") == 0) {
+ if (challenge_blob != NULL) {
+ status = WBC_ERR_INVALID_PARAM;
+ goto fail;
+ }
+ challenge_blob = ¶ms->blobs[i];
+ continue;
+ }
+ }
+
if (params->domain_name != NULL) {
status = wbcRequestResponse(WINBINDD_INFO, NULL, &response);
if (!WBC_ERROR_IS_OK(status)) {
@@ -1225,17 +1244,6 @@ wbcErr wbcCredentialCache(struct
wbcCredentialCacheParams *params,
}
request.data.ccache_ntlm_auth.uid = getuid();
- for (i=0; inum_blobs; i++) {
- if (strcasecmp(params->blobs[i].name, "initial_blob") == 0) {
- initial_blob = ¶ms->blobs[i];
- break;
- }
- if (strcasecmp(params->blobs[i].name, "challe
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/2014-07-15-1241/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-07-15-1241/samba.stderr http://git.samba.org/autobuild.flakey/2014-07-15-1241/samba.stdout The top commit at the time of the failure was: commit ca1e4af466af83c0f28804813dc19a77c340f981 Author: Jeremy Allison Date: Mon Jul 14 10:22:52 2014 -0700 As David Woodhouse points out, this breaks backwards compatibility. https://bugzilla.samba.org/show_bug.cgi?id=10692 Revert "libwbclient: reject unknown named blobs in wbcCredentialCache()" This reverts commit 740d12d1e77d356ff22c3725dce8d5019c86a7a5. Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Mon Jul 14 21:54:08 CEST 2014 on sn-devel-104
