[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0c1669e s3:smb2cli: ignore the NBT/Length header in
smb2cli_inbuf_parse_compound()
from 1ad05d8 Some formatting fixes, remove unused imports.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0c1669ee4b1783db98b0375dd5e4ed0dfc3e10c5
Author: Stefan Metzmacher me...@samba.org
Date: Sat Nov 5 11:40:02 2011 +0100
s3:smb2cli: ignore the NBT/Length header in smb2cli_inbuf_parse_compound()
This is not needed and in future we want to support SMBDirect,
which add a different header.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Sun Nov 6 17:17:04 CET 2011 on sn-devel-104
---
Summary of changes:
source3/libsmb/smb2cli_base.c | 14 +++---
1 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/smb2cli_base.c b/source3/libsmb/smb2cli_base.c
index de4a06b..3a59af0 100644
--- a/source3/libsmb/smb2cli_base.c
+++ b/source3/libsmb/smb2cli_base.c
@@ -401,22 +401,22 @@ static NTSTATUS smb2cli_inbuf_parse_compound(uint8_t
*buf, TALLOC_CTX *mem_ctx,
int num_iov;
size_t buflen;
size_t taken;
+ uint8_t *first_hdr;
- num_iov = 1;
+ num_iov = 0;
iov = talloc_array(mem_ctx, struct iovec, num_iov);
if (iov == NULL) {
return NT_STATUS_NO_MEMORY;
}
- iov[0].iov_base = buf;
- iov[0].iov_len = 4;
- buflen = smb_len_tcp(buf) + 4;
- taken = 4;
+ buflen = smb_len_tcp(buf);
+ taken = 0;
+ first_hdr = buf + NBT_HDR_SIZE;
while (taken buflen) {
size_t len = buflen - taken;
- uint8_t *hdr = buf + taken;
+ uint8_t *hdr = first_hdr + taken;
struct iovec *cur;
size_t full_size;
size_t next_command_ofs;
@@ -558,7 +558,7 @@ static void smb2cli_inbuf_received(struct tevent_req
*subreq)
return;
}
- for (i=1; inum_iov; i+=3) {
+ for (i=0; inum_iov; i+=3) {
uint8_t *inbuf_ref = NULL;
struct iovec *cur = iov[i];
uint8_t *inhdr = (uint8_t *)cur[0].iov_base;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 384eaba s4: samba-tool user --help documenation improvements Signed-off-by: Theresa Halloran thall...@linux.vnet.ibm.com via f0ae7e1 kcc: fixed program name via eb9c35c kcc: fixed tabs/spaces in kcc python implementation via d85b6ed samba_kcc addtion via c78dac4 add python KCC utility classes and methods via a5d6e42 python dsdb flag addtions (NTDSSETTINGS, NTDSCONN) from 0c1669e s3:smb2cli: ignore the NBT/Length header in smb2cli_inbuf_parse_compound() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 384eaba38e4da2a2e72e1ec5bfea7d7776d16a11 Author: Theresa Halloran thall...@linux.vnet.ibm.com Date: Wed Nov 2 10:33:12 2011 -0400 s4: samba-tool user --help documenation improvements Signed-off-by: Theresa Halloran thall...@linux.vnet.ibm.com Autobuild-User: Andrew Tridgell tri...@samba.org Autobuild-Date: Mon Nov 7 01:39:25 CET 2011 on sn-devel-104 commit f0ae7e191682de1e56ca1ed2a9e9aa67e9d22b14 Author: Andrew Tridgell tri...@samba.org Date: Mon Nov 7 09:55:01 2011 +1100 kcc: fixed program name kcccompute - samba_kcc commit eb9c35cbb77fa16f8301428ce163359008d1687f Author: Andrew Tridgell tri...@samba.org Date: Mon Nov 7 09:53:06 2011 +1100 kcc: fixed tabs/spaces in kcc python implementation as spotted by autobuild commit d85b6edf8cdfd953ce96a50466595384db4c698b Author: Dave Craft wimber...@gmail.com Date: Thu Nov 3 12:39:53 2011 -0500 samba_kcc addtion Scaffolding and initial implementations of portions of the KCC in python. This code currently properly computes the graph nodes for the intrasite topology as well as enumerating all steps for a full run of the KCC. Signed-off-by: Andrew Tridgell tri...@samba.org commit c78dac4fde0fdcdfe44a4bc98da30f43cf32ff6c Author: Dave Craft wimber...@gmail.com Date: Thu Nov 3 12:37:24 2011 -0500 add python KCC utility classes and methods New file source4/scripting/python/samba/kcc_utils.py contains classes and methods for: DirectoryServiceAgent NTDSConnection GraphNode NamingContext NCReplica These are consumed by a new samba_kcc python script for KCC topology computation Signed-off-by: Andrew Tridgell tri...@samba.org commit a5d6e427c5a60a0638d952c56e26cca421d3af9c Author: Dave Craft wimber...@gmail.com Date: Thu Nov 3 12:33:38 2011 -0500 python dsdb flag addtions (NTDSSETTINGS, NTDSCONN) Add missing flags present in C code base to python code base dsdb/pydsdb.c INSTANCE_TYPE... DS_NTDSSETTINGS_OPT... NTDSCONN_OPT... These are consumed by the python KCC scripts Signed-off-by: Andrew Tridgell tri...@samba.org --- Summary of changes: source4/dsdb/pydsdb.c | 27 + source4/scripting/bin/samba_kcc | 703 source4/scripting/bin/wscript_build |1 + source4/scripting/python/samba/kcc_utils.py | 890 + source4/scripting/python/samba/netcmd/__init__.py | 17 +- source4/scripting/python/samba/netcmd/user.py | 136 +++- source4/scripting/wscript_build |2 +- 7 files changed, 1768 insertions(+), 8 deletions(-) create mode 100755 source4/scripting/bin/samba_kcc create mode 100644 source4/scripting/python/samba/kcc_utils.py Changeset truncated at 500 lines: diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c index 2ff6b82..57e08cc 100644 --- a/source4/dsdb/pydsdb.c +++ b/source4/dsdb/pydsdb.c @@ -1084,6 +1084,14 @@ void initdsdb(void) ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2008); ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2008_R2); +/* nc replica flags */ + ADD_DSDB_FLAG(INSTANCE_TYPE_IS_NC_HEAD); + ADD_DSDB_FLAG(INSTANCE_TYPE_UNINSTANT); + ADD_DSDB_FLAG(INSTANCE_TYPE_WRITE); + ADD_DSDB_FLAG(INSTANCE_TYPE_NC_ABOVE); + ADD_DSDB_FLAG(INSTANCE_TYPE_NC_COMING); + ADD_DSDB_FLAG(INSTANCE_TYPE_NC_GOING); + /* systemFlags */ ADD_DSDB_FLAG(SYSTEM_FLAG_CR_NTDS_NC); ADD_DSDB_FLAG(SYSTEM_FLAG_CR_NTDS_DOMAIN); @@ -1121,6 +1129,17 @@ void initdsdb(void) ADD_DSDB_FLAG(DS_FLAG_ATTR_REQ_PARTIAL_SET_MEMBER); ADD_DSDB_FLAG(DS_FLAG_ATTR_IS_CONSTRUCTED); + ADD_DSDB_FLAG(DS_NTDSSETTINGS_OPT_IS_AUTO_TOPOLOGY_DISABLED); + ADD_DSDB_FLAG(DS_NTDSSETTINGS_OPT_IS_TOPL_CLEANUP_DISABLED); + ADD_DSDB_FLAG(DS_NTDSSETTINGS_OPT_IS_TOPL_MIN_HOPS_DISABLED); + ADD_DSDB_FLAG(DS_NTDSSETTINGS_OPT_IS_TOPL_DETECT_STALE_DISABLED); + ADD_DSDB_FLAG(DS_NTDSSETTINGS_OPT_IS_INTER_SITE_AUTO_TOPOLOGY_DISABLED); + ADD_DSDB_FLAG(DS_NTDSSETTINGS_OPT_IS_GROUP_CACHING_ENABLED); +
