[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1022c28 s3: Fix bug 8360
from d2d2e7a s3-passdb: Fix python < 2.6 build errors in passdb python
wrapper
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1022c28e15acfc68aedc8b6853417d2f1f357f2a
Author: Volker Lendecke
Date: Thu Aug 11 16:52:22 2011 +0200
s3: Fix bug 8360
OS/2 sends an unexpected write&x/read&x chain
Autobuild-User: Volker Lendecke
Autobuild-Date: Sun Aug 14 08:48:58 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/smbd/process.c | 23 ---
1 files changed, 16 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index f542dcd..6d391df 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2025,15 +2025,24 @@ void chain_reply(struct smb_request *req)
SMB_PERFCOUNT_SET_MSGLEN_IN(&req->pcd, smblen);
/*
-* Check if the client tries to fool us. The request so far uses the
-* space to the end of the byte buffer in the request just
-* processed. The chain_offset can't point into that area. If that was
-* the case, we could end up with an endless processing of the chain,
-* we would always handle the same request.
+* Check if the client tries to fool us. The chain offset
+* needs to point beyond the current request in the chain, it
+* needs to strictly grow. Otherwise we might be tricked into
+* an endless loop always processing the same request over and
+* over again. We used to assume that vwv and the byte buffer
+* array in a chain are always attached, but OS/2 the
+* Write&X/Read&X chain puts the Read&X vwv array right behind
+* the Write&X vwv chain. The Write&X bcc array is put behind
+* the Read&X vwv array. So now we check whether the chain
+* offset points strictly behind the previous vwv
+* array. req->buf points right after the vwv array of the
+* previous request. See
+* https://bugzilla.samba.org/show_bug.cgi?id=8360 for more
+* information.
*/
- already_used = PTR_DIFF(req->buf+req->buflen, smb_base(req->inbuf));
- if (chain_offset < already_used) {
+ already_used = PTR_DIFF(req->buf, smb_base(req->inbuf));
+ if (chain_offset <= already_used) {
goto error;
}
--
Samba Shared Repository
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-467-g71cbca9
The branch, 1.2 has been updated
via 71cbca93a2641facfc6e231c44fe6500f55e1905 (commit)
from 0267ff4e017243aeef11adcb737eeccb475578a8 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2
- Log -
commit 71cbca93a2641facfc6e231c44fe6500f55e1905
Author: Ronnie Sahlberg
Date: Sun Aug 14 13:50:12 2011 +1000
remove the nfs share check completely from the 1.2 branch
---
Summary of changes:
config/events.d/60.nfs |7 ---
1 files changed, 0 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index ea05b1b..35055fb 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -47,13 +47,6 @@ case "$1" in
;;
monitor)
- # and that its directories are available
- [ "$CTDB_NFS_SKIP_SHARE_CHECK" = "yes" ] || {
- exportfs | grep -v '^#' | grep '^/' |
- sed -e 's/[[:space:]]\+[^[:space:]]*$//' |
- ctdb_check_directories
- } || exit $?
-
if ctdb_service_needs_reconfigure ; then
ctdb_service_reconfigure
exit 0
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d2d2e7a s3-passdb: Fix python < 2.6 build errors in passdb python
wrapper
from c84caab s4:misc: remove last usage of legacy event_ fn names
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d2d2e7ab0228c1a753555f87d1d40743e366a00a
Author: Andrew Bartlett
Date: Sun Aug 14 10:05:42 2011 +1000
s3-passdb: Fix python < 2.6 build errors in passdb python wrapper
Autobuild-User: Andrew Bartlett
Autobuild-Date: Sun Aug 14 03:59:48 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/passdb/py_passdb.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c
index 17d4415..30c3f8c 100644
--- a/source3/passdb/py_passdb.c
+++ b/source3/passdb/py_passdb.c
@@ -29,6 +29,10 @@
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
#endif
+#ifndef Py_TYPE /* Py_TYPE is only available on Python > 2.6 */
+#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
+#endif
+
#ifndef PY_CHECK_TYPE
#define PY_CHECK_TYPE(type, var, fail) \
if (!PyObject_TypeCheck(var, type)) {\
--
Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-08-14-0323/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-14-0323/samba3.stderr http://git.samba.org/autobuild.flakey/2011-08-14-0323/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-14-0323/samba4.stderr http://git.samba.org/autobuild.flakey/2011-08-14-0323/samba4.stdout The top commit at the time of the failure was: commit c84caabf8c5061af75d9e046813c1e2e8eff3722 Author: Simo Sorce Date: Tue May 25 15:29:14 2010 -0400 s4:misc: remove last usage of legacy event_ fn names Autobuild-User: Simo Sorce Autobuild-Date: Sun Aug 14 00:38:13 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via c84caab s4:misc: remove last usage of legacy event_ fn names via 15efcba s4:lib: use tevent_ fns names instead of legcay event_ ones via edc3266 s4:smbd: use tevent_ fn names instead of leagcy event_ ones via b1feb9d s4:ntvfs: use tevent_ fn names instead of legacy event_ ones via 4a8fdc3 s4:librpc: use tevent_ fn names instead of legacy event_ ones via ab81505 s4:libcli: use tevent_ fn names instead of legacy event_ ones via f364dae s4:dsdb: use tevent_ fn names instaed of legacy event_ ones via 47b6457 s4:messaging: use tevent_ function names instead of legacy event_ ones via b120c5f torture: use tevent_ functions names instead of the legacy event_ ones from 813bdf4 ldb: Remove use after free in error case http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c84caabf8c5061af75d9e046813c1e2e8eff3722 Author: Simo Sorce Date: Tue May 25 15:29:14 2010 -0400 s4:misc: remove last usage of legacy event_ fn names Autobuild-User: Simo Sorce Autobuild-Date: Sun Aug 14 00:38:13 CEST 2011 on sn-devel-104 commit 15efcbaa09472b306a875178ee535a06d1b01811 Author: Simo Sorce Date: Tue May 25 15:28:35 2010 -0400 s4:lib: use tevent_ fns names instead of legcay event_ ones commit edc32665d0f5cfd5d86f975c8ac8e8ff100956f7 Author: Simo Sorce Date: Tue May 25 15:28:10 2010 -0400 s4:smbd: use tevent_ fn names instead of leagcy event_ ones commit b1feb9d4324dfca7190ec3816d43392b65a94671 Author: Simo Sorce Date: Tue May 25 15:27:41 2010 -0400 s4:ntvfs: use tevent_ fn names instead of legacy event_ ones commit 4a8fdc3958b7bc42bd90d4307f6fb0556944b300 Author: Simo Sorce Date: Tue May 25 15:27:11 2010 -0400 s4:librpc: use tevent_ fn names instead of legacy event_ ones commit ab81505e080e72c2217cb3946b04eee872397763 Author: Simo Sorce Date: Tue May 25 15:26:42 2010 -0400 s4:libcli: use tevent_ fn names instead of legacy event_ ones commit f364daed2203170bc772c8ff9bb28f78da615669 Author: Simo Sorce Date: Tue May 25 15:26:00 2010 -0400 s4:dsdb: use tevent_ fn names instaed of legacy event_ ones commit 47b64573c0d41d418d441ffc40325b822bfadb26 Author: Simo Sorce Date: Tue May 25 15:25:26 2010 -0400 s4:messaging: use tevent_ function names instead of legacy event_ ones commit b120c5f28876fd9efe032a6dbecebfaaff7dfd14 Author: Simo Sorce Date: Tue May 25 15:23:55 2010 -0400 torture: use tevent_ functions names instead of the legacy event_ ones --- Summary of changes: source3/torture/torture.c |6 +++--- source4/auth/gensec/socket.c|6 +++--- source4/dsdb/kcc/kcc_periodic.c |2 +- source4/dsdb/repl/drepl_notify.c|2 +- source4/dsdb/repl/drepl_periodic.c |2 +- source4/lib/com/main.c |2 +- source4/lib/messaging/messaging.c | 16 source4/lib/messaging/tests/irpc.c |6 +++--- source4/lib/messaging/tests/messaging.c |4 ++-- source4/lib/socket/connect.c|4 ++-- source4/lib/socket/connect_multi.c |2 +- source4/lib/stream/packet.c | 16 source4/lib/tls/tls.c | 20 ++-- source4/libcli/composite/composite.c|8 source4/libcli/dgram/dgramsocket.c | 12 ++-- source4/libcli/dgram/mailslot.c |2 +- source4/libcli/raw/clitransport.c | 14 +++--- source4/libcli/raw/rawrequest.c |2 +- source4/libcli/resolve/dns_ex.c |2 +- source4/libcli/smb2/request.c |2 +- source4/libcli/smb2/transport.c | 14 +++--- source4/librpc/rpc/dcerpc.c |8 source4/librpc/rpc/dcerpc_connect.c |2 +- source4/librpc/rpc/dcerpc_sock.c|8 source4/nbt_server/register.c |2 +- source4/nbt_server/wins/winsclient.c|4 ++-- source4/ntvfs/posix/pvfs_notify.c |2 +- source4/ntvfs/posix/pvfs_search.c |2 +- source4/ntvfs/posix/pvfs_wait.c |2 +- source4/ntvfs/posix/pvfs_write.c|4 ++-- source4/rpc_server/echo/rpc_echo.c |2 +- source4/smbd/process_onefork.c |2 +- source4/smbd/process_prefork.c |6 +++--- source4/smbd/process_standard.c |4 ++-- source4/smbd/process_thread.c |4 ++-- source4/torture/basic/base.c|2 +- source4/torture/basic/misc.c|2 +- source4/torture/nbt/dgram.c | 20 ++-- source4/torture/nbt/query.c |4 ++-- source4/torture/nbt/wins.c |4 ++-- source4/torture/nbt/winsbench.c |4 ++-- source4/tor
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 813bdf4 ldb: Remove use after free in error case via 070b970 s4-provision Add support for fixing the DC rid to a particular value via daa78ea s3-smbd Avoid races creating 'ncaclrpc dir' with epmd in a child process via b51f973 s4-param Set szConfigFile even for s3 loadparm contexts via 305cb56 upgrade: Add missing bits for the s3 to s4 upgrade script via 64ec42d tests: Update test for s3 to s4 upgrade with two cases via 1c1f7df s3-passdb: Added python method to get_global_sam_sid via e580f33 s3-passdb: Return dom_sid and guid with correct python types. via a252e69 passdb: Move python wrapper for passdb in samba3 python package via 9a4a2b0 py-samba3: Create samba3 python package to hold other modules via 6d139d6 s3-param: Add python wrapper for s3 parameters via 6a18664 s3-passdb: Connect to specified samdb if location is provided, otherwise use default via d7ab07e s3-passdb: Fix the error messages and return correct NTSTATUS via ae65b97 s4-dsdb: Provide additional method to connect to specified database path via 8e4e408 s3-param: Make sure we have talloc stack frame before calling in s3 code via 7c9ecf3 param: Add smb.conf loading support to s3/s4 loadparm bridge via 11698a2 s4-dsdb ensure we honour the hash_values control, even for really odd hashes via 2d6e98e s4-dsdb Give a less worrying error message on failure to get a transaction via 93e8d3b s4-scripting Rename passdb upgrade routine to avoid conflict with upgradeprovision via 00364e4 s3-passdb Add support for pdb_add_sam_account() and password hashes to pdb_samba4 via 2993113 s4-dsdb Add ability to force a particular SID in the upgrade case via add8505 s3-passdb Make pdb_element_is_changed available to all passdb modules via c5e41a2 s4-dsdb Add flag to set DSDB_BYPASS_PASSWORD_HASH control via 65e12c0 passdb: Allocate talloc stackframe before calling in pdb functions. via ae9a327 passdb: Call with correct backend methods instead of default methods via 2e0ccc4 passdb: Added python wrapper to passdb via 08ccc6e passdb: Add a function to read secrets db from a specified path via 6f21f55 passdb: Add a function to expose loaded backend list. via a1088d0 waf: Add SAMBA3_PYTHON context to build python wrappers in samba3 via 4967b04 samba-tool: Remove gpo setacl command from eeb0298 s3:smb2cli: pass more fields to smb2cli_req_create()/smb2cli_req_send() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 813bdf466d1e0262c7b4bdf98343451db08c60f6 Author: Andrew Bartlett Date: Sat Aug 13 13:42:04 2011 +1000 ldb: Remove use after free in error case Autobuild-User: Andrew Bartlett Autobuild-Date: Sat Aug 13 13:49:44 CEST 2011 on sn-devel-104 commit 070b970a9d0b4c490d652eb1c5aa5fb23cc7b6a6 Author: Andrew Bartlett Date: Sat Aug 13 13:32:18 2011 +1000 s4-provision Add support for fixing the DC rid to a particular value This will allow an upgraded DC to keep its SID, while being upgraded to AD. We also watch for the highest RID in the existing DB to set next_rid for other additional users. Andrew Bartlett commit daa78ead19fcbfcd5aa169d96c11ab8df49efe4b Author: Andrew Bartlett Date: Sat Aug 13 13:30:16 2011 +1000 s3-smbd Avoid races creating 'ncaclrpc dir' with epmd in a child process commit b51f97325b8ea330e20ee7c4bf673c4475dd0a0e Author: Andrew Bartlett Date: Fri Aug 12 22:17:26 2011 +1000 s4-param Set szConfigFile even for s3 loadparm contexts commit 305cb567f4f14ef329efc4756a17483076d9270c Author: Amitay Isaacs Date: Fri Aug 12 11:37:57 2011 +1000 upgrade: Add missing bits for the s3 to s4 upgrade script Use passdb backend to import/export users Remove unused options for upgrade_from_s3 command (--blank) and credentials options Config file is specified with -s/--configfile option and no need to specify as an argument. Pair-Programmed-With: Andrew Bartlett commit 64ec42d64f0a6029b135c49cfeb8bc5c6f8cbdbe Author: Amitay Isaacs Date: Fri Aug 12 17:47:49 2011 +1000 tests: Update test for s3 to s4 upgrade with two cases S3-member to S4-member and S3-dc to S4-dc Pair-Programmed-With: Andrew Bartlett commit 1c1f7df956de9658a0bc4594af3202badbdaeeeb Author: Amitay Isaacs Date: Fri Aug 12 17:10:17 2011 +1000 s3-passdb: Added python method to get_global_sam_sid Pair-Programmed-With: Andrew Bartlett commit e580f33b131471b9fa70764d3fc395db592accd2 Author: Amitay Isaacs Date: Fri Aug 12 17:09:19 2011 +1000 s3-passdb: Return dom_sid and guid with correct python types. Pair-Programmed-With: Andrew Bartlett comm
