The branch, v4-1-test has been updated
via 6207530 s4-dns: dlz_bind9: Create dns-HOSTNAME account disabled
via 5cc42ac vfs: Fix some build warnings in glusterfs.
via 289b7fa vfs: Fix building the glusterfs module.
via 8db5ecc libcli/smb: fix smb2cli_ioctl*() against Windows 2008.
from 67840df nsswitch: Fix short writes in winbind_write_sock
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test
- Log -----------------------------------------------------------------
commit 62075301713602612fe3eae92ce4b23e14ab8fa8
Author: Samuel Cabrero <scabr...@zentyal.com>
Date: Thu Oct 24 17:37:06 2013 +0200
s4-dns: dlz_bind9: Create dns-HOSTNAME account disabled
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Autobuild-User(master): Andrew Bartlett <abart...@samba.org>
Autobuild-Date(master): Fri Oct 25 00:39:21 CEST 2013 on sn-devel-104
(cherry picked from commit d3aee80928dc7ccde9441309bf946c2503f7714a)
Part of a fix for bug # 9091 - When replicating DNS for bind9_dlz we need to
create the server-DNS account remotely.
Autobuild-User(v4-1-test): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(v4-1-test): Wed Nov 6 14:28:14 CET 2013 on sn-devel-104
commit 5cc42acbea2657ff712ce9e91ffbf81d86a371f5
Author: Andreas Schneider <a...@samba.org>
Date: Mon Nov 4 12:32:05 2013 +0100
vfs: Fix some build warnings in glusterfs.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: David Disseldorp <dd...@samba.org>
(cherry picked from commit d35d6a2dfa92512049e762d7abc319c67118e705)
The last 2 patches address bug #10253 - Include vfs_glusterfs build fix
patches
in Samba 4.1.
commit 289b7fa7492c3cec757d8fe03a51e384c60ce9b8
Author: Andreas Schneider <a...@samba.org>
Date: Mon Nov 4 12:32:04 2013 +0100
vfs: Fix building the glusterfs module.
Using calloc directly throws an error. This fixes building the glusterfs
module.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: David Disseldorp <dd...@samba.org>
(cherry picked from commit 25d62dda5c64aefeab0059d9437756f8aaec5397)
commit 8db5eccaf25ae3d6c047ad642370ed154b0fddc7
Author: Stefan Metzmacher <me...@samba.org>
Date: Mon Oct 28 15:43:03 2013 +0100
libcli/smb: fix smb2cli_ioctl*() against Windows 2008.
The subsections of [MS-SMB2] "3.2.5.14 Receiving an SMB2 IOCTL Response"
say the client should ignore the InputOffset/InputCount.
We do that only if we ask for max_input_length = 0.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10232
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Thu Oct 31 01:16:10 CET 2013 on sn-devel-104
(cherry picked from commit 127fc670a39d15eaa3869045fca0287ba7df9efa)
-----------------------------------------------------------------------
Summary of changes:
libcli/smb/smb2cli_ioctl.c | 33 +++++++++++++++++++++++++++++----
python/samba/join.py | 11 +++++++----
source3/modules/vfs_glusterfs.c | 8 ++++----
3 files changed, 40 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smb2cli_ioctl.c b/libcli/smb/smb2cli_ioctl.c
index 8de7635..3090693 100644
--- a/libcli/smb/smb2cli_ioctl.c
+++ b/libcli/smb/smb2cli_ioctl.c
@@ -213,7 +213,21 @@ static void smb2cli_ioctl_done(struct tevent_req *subreq)
return;
}
- if (input_buffer_length < dyn_len) {
+ ofs = input_buffer_length;
+ ofs = NDR_ROUND(ofs, 8);
+
+ if (state->max_input_length == 0) {
+ /*
+ * If max_input_length is 0 we ignore
+ * the input_buffer_length, because
+ * Windows 2008 echos the DCERPC request
+ * from the requested input_buffer
+ * to the response input_buffer.
+ */
+ input_buffer_length = 0;
+ }
+
+ if (input_buffer_length > dyn_len) {
tevent_req_nterror(
req, NT_STATUS_INVALID_NETWORK_RESPONSE);
return;
@@ -228,8 +242,11 @@ static void smb2cli_ioctl_done(struct tevent_req *subreq)
state->out_input_buffer.data = dyn;
state->out_input_buffer.length = input_buffer_length;
- ofs = input_buffer_length;
- ofs = NDR_ROUND(ofs, 8);
+ if (ofs > dyn_len) {
+ tevent_req_nterror(
+ req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+ return;
+ }
dyn_ofs += ofs;
dyn += ofs;
@@ -243,7 +260,15 @@ static void smb2cli_ioctl_done(struct tevent_req *subreq)
return;
}
- if (output_buffer_length < dyn_len) {
+ if (state->max_output_length == 0) {
+ /*
+ * We do the same logic as for
+ * max_input_length.
+ */
+ output_buffer_length = 0;
+ }
+
+ if (output_buffer_length > dyn_len) {
tevent_req_nterror(
req, NT_STATUS_INVALID_NETWORK_RESPONSE);
return;
diff --git a/python/samba/join.py b/python/samba/join.py
index fcdd4ec..7d2f913 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -606,15 +606,18 @@ class dc_join(object):
"DNSNAME" :
ctx.dnshostname}))
for changetype, msg in recs:
assert changetype == ldb.CHANGETYPE_NONE
+ dns_acct_dn = msg["dn"]
print "Adding DNS account %s with dns/ SPN" % msg["dn"]
# Remove dns password (we will set it as a modify, as we can't
do clearTextPassword over LDAP)
del msg["clearTextPassword"]
# Remove isCriticalSystemObject for similar reasons, it cannot
be set over LDAP
del msg["isCriticalSystemObject"]
+ # Disable account until password is set
+ msg["userAccountControl"] = str(samba.dsdb.UF_NORMAL_ACCOUNT |
+ samba.dsdb.UF_ACCOUNTDISABLE)
try:
ctx.samdb.add(msg)
- dns_acct_dn = msg["dn"]
except ldb.LdbError, (num, _):
if num != ldb.ERR_ENTRY_ALREADY_EXISTS:
raise
@@ -624,7 +627,7 @@ class dc_join(object):
# connections which are hard to set up and otherwise refuse with
# ERR_UNWILLING_TO_PERFORM. In this case we fall back to libnet
# over SAMR.
- print "Setting account password for %s" % ctx.samname
+ print "Setting account password for dns-%s" % ctx.myname
try:
ctx.samdb.setpassword("(&(objectClass=user)(samAccountName=dns-%s))"
% ldb.binary_encode(ctx.myname),
@@ -633,8 +636,8 @@ class dc_join(object):
username=ctx.samname)
except ldb.LdbError, (num, _):
if num != ldb.ERR_UNWILLING_TO_PERFORM:
- pass
- ctx.net.set_password(account_name="dns-" % ctx.myname,
+ raise
+ ctx.net.set_password(account_name="dns-%s" % ctx.myname,
domain_name=ctx.domain_name,
newpassword=ctx.dnspass)
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 237236a..e5c691e 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -707,12 +707,12 @@ static char *vfs_gluster_getwd(struct vfs_handle_struct
*handle)
char *cwd;
char *ret;
- cwd = calloc(1, PATH_MAX + 1);
+ cwd = SMB_CALLOC_ARRAY(char, PATH_MAX);
if (cwd == NULL) {
return NULL;
}
- ret = glfs_getcwd(handle->data, cwd, PATH_MAX);
+ ret = glfs_getcwd(handle->data, cwd, PATH_MAX - 1);
if (ret == 0) {
free(cwd);
}
@@ -1300,7 +1300,7 @@ static SMB_ACL_T vfs_gluster_sys_acl_get_file(struct
vfs_handle_struct *handle,
{
struct smb_acl_t *result;
char *buf;
- char *key;
+ const char *key;
ssize_t ret;
switch (type) {
@@ -1363,7 +1363,7 @@ static int vfs_gluster_sys_acl_set_file(struct
vfs_handle_struct *handle,
SMB_ACL_T theacl)
{
int ret;
- char *key;
+ const char *key;
char *buf;
ssize_t size;
--
Samba Shared Repository
