[SCM] build.samba.org - branch master updated
The branch, master has been updated via 45c555c Don't rely on stages having the same names. from 6bb8d56 Add assert message. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 45c555c4dd5813c01835b31cabfadfbfb2f1919e Author: Jelmer Vernooij Date: Tue Dec 14 08:57:07 2010 +0100 Don't rely on stages having the same names. --- Summary of changes: buildfarm/build.py | 10 +++--- 1 files changed, 7 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/build.py b/buildfarm/build.py index 28ff6d9..7689364 100644 --- a/buildfarm/build.py +++ b/buildfarm/build.py @@ -130,9 +130,13 @@ class BuildStatus(object): if len(self.stages) < len(older.stages): # Less stages completed return True -for ((old_name, old_result), (new_name, new_result)) in zip( -older.stages, self.stages): -assert old_name == new_name, "build stage name mismatch: %s != %s" % (old_name, new_name) +old_stages = dict(older.stages) +new_stages = dict(self.stages) +for name, new_result in new_stages.iteritems(): +try: +old_result = old_stages[name] +except KeyError: +continue if new_result == old_result: continue if new_result < 0 and old_result >= 0: -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 6bb8d56 Add assert message. from 9d3f47c Cope with negative failure numbers. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 6bb8d56672cb3ff20cff3758fa47e86089f86319 Author: Jelmer Vernooij Date: Tue Dec 14 08:46:07 2010 +0100 Add assert message. --- Summary of changes: buildfarm/build.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/build.py b/buildfarm/build.py index 7c371b1..28ff6d9 100644 --- a/buildfarm/build.py +++ b/buildfarm/build.py @@ -132,7 +132,7 @@ class BuildStatus(object): return True for ((old_name, old_result), (new_name, new_result)) in zip( older.stages, self.stages): -assert old_name == new_name +assert old_name == new_name, "build stage name mismatch: %s != %s" % (old_name, new_name) if new_result == old_result: continue if new_result < 0 and old_result >= 0: -- build.samba.org
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 56b67fd s3-libsmb Improve error message when denying LM encryption via 98edb35 s3-dns Don't use DELEG_FLAG in DNS update, Windows 2008R2 does not like it (cherry picked from commit 280caa6b3bb1199939f9349ea5a436a491c81791) via be08832 s3-dns Don't use SEQUENCE_FLAG in DNS update, Windows 2008R2 does not like it via 10c5a59 s3-net Allow 'net ads dns register' to take an optional hostname argument via c4346f5 s3-winbind Improve memory handling in NTLMv2-backend plaintext authentication via cd37c4c s3-winbind Don't send the LM password to the server, ever via ce2651d s3-libsmb Don't ever ask for machine$ principals as a target. via 9c3b5d4 s3-docs Add docs for 'client use spnego principal' and 'send spengo principal' via 8e48271 s3-docs Explain change to NTLMv2 by default in the client (cherry picked from commit d69b4f13f7edda8d8457315936051cc9d3fb103f) via 620e41c s3-client Use NTLMv2 by default in the Samba client via 807c42f s3-smbd Don't send SPNEGO principal (rfc4178 hint) by default via 27ac2e2 s3-libads Default to NOT using the server-supplied principal from SPNEGO via ff413c5 s4-spnego Match Windows 2008, and no longer supply a name in the CIFS Negprot via 54fb657 s4-tests Workaround new default of 'client ntlmv2 auth = yes' in tests via a93dc43 s4-client Use NTLMv2 by default in the Samba4 client. (cherry picked from commit 54ee213fa5da6b138ab367b537c5e084edf35ff2) via ad5dec4 s4-spnego use "not_defined_in_rfc4...@please_ignore" if no principal specified via 1d44686 libcli/auth bring ADS_IGNORE_PRINCIPAL in common (cherry picked from commit a21cb5a0a11c63f7746a483dca845c12dcfdf1b2) from 274fc73 Ensure we use vfs_fsp_stat(), not VFS_STAT directly, and store into fsp->fsp_name->st instead of a SMB_STRUCT_STAT on the stack. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 56b67fd48a3bf3dba20a07af32505c30208887c4 Author: Andrew Bartlett Date: Mon Dec 13 12:40:25 2010 +1100 s3-libsmb Improve error message when denying LM encryption Now that 'client ntlmv2 auth = yes' is the default, make it more clear what options a user may need to enable to get this to work. Andrew Bartlett (cherry picked from commit d97492e42a65540febae93dd0255b91d034f9def) commit 98edb35d73bd1b9be05e0d53ed81f79137e3f4ad Author: Andrew Bartlett Date: Fri Dec 10 15:32:08 2010 +1100 s3-dns Don't use DELEG_FLAG in DNS update, Windows 2008R2 does not like it (cherry picked from commit 280caa6b3bb1199939f9349ea5a436a491c81791) commit be088324479bd852a7561ba2eaa5c0489398b061 Author: Andrew Bartlett Date: Fri Dec 10 15:30:22 2010 +1100 s3-dns Don't use SEQUENCE_FLAG in DNS update, Windows 2008R2 does not like it Andrew Bartlett (cherry picked from commit 0f1cc889a26477e9a98629f120fe5890b2e106fa) commit 10c5a59315ef69eeb4d8bc19237de9787284a63d Author: Andrew Bartlett Date: Fri Dec 10 15:08:53 2010 +1100 s3-net Allow 'net ads dns register' to take an optional hostname argument This allows the administrator to more carefully chose what name to register. Andrew Bartlett (cherry picked from commit c2a1ad9047508cf2745a9019e6783c8b8f7ef475) commit c4346f50b706c3fbe0f909ce2371fdca0f1f7230 Author: Andrew Bartlett Date: Fri Dec 10 12:12:23 2010 +1100 s3-winbind Improve memory handling in NTLMv2-backend plaintext authentication Andrew Bartlett (cherry picked from commit 6195dfc0eb310a2362cb949a000979514a52c648) commit cd37c4c42f0896b2cfe9588b4491c542991c0dc9 Author: Andrew Bartlett Date: Fri Dec 10 12:10:07 2010 +1100 s3-winbind Don't send the LM password to the server, ever This is for the case where we have the plaintext password locally, and can construct the challenge-response values here. We should never ever use the LM password in domain authentication. The last domain controller to only have LM passwords stored was NT 3.5. Andrew Bartlett (cherry picked from commit 5cfe949108f253a8e20c835cb53fe6f5eae7fbb5) commit ce2651ddfc9de0d4fcfd169cdb4437194707b4a6 Author: Andrew Bartlett Date: Fri Dec 10 07:57:59 2010 +1100 s3-libsmb Don't ever ask for machine$ principals as a target. It is never correct to ask for a machine$ principal as the target of a kerberos connection. You should always connect via the servicePrincipalName. This current code appears to have built up from a series of minimal changes, as the codebase adapted the to lack of a SPNEGO principal from Windows 2008. Andrew Bartlett (cherry picked from commit f13404e27b00f826a11684e69cff82ae0023fc91) commit 9c3b5d4d286e5850091d843551a936b88f677c58 Author: Andrew Bartlett Da
[SCM] Samba GTK+ frontends branch, master, updated. 438a8f362aeba432be997ec1e72775887bdf1e98
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Samba GTK+ frontends".
The branch, master has been updated
via 438a8f362aeba432be997ec1e72775887bdf1e98 (commit)
via c59d8c8ad3977b9c069e539277551f48194b583a (commit)
via a6003a667f6ce59e72da4a8ff5dd562104b9bfe4 (commit)
via 09506b5428897fe0db9445270c331caca3f94134 (commit)
from 8a244af6031682605caf7c7f6f6646535407573d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 438a8f362aeba432be997ec1e72775887bdf1e98
Author: Jelmer Vernooij
Date: Wed Dec 8 03:13:42 2010 +0100
remove unnecessary workaround.
commit c59d8c8ad3977b9c069e539277551f48194b583a
Author: Jelmer Vernooij
Date: Sat Nov 20 17:20:50 2010 +0100
Add setup file.
commit a6003a667f6ce59e72da4a8ff5dd562104b9bfe4
Author: Jelmer Vernooij
Date: Sat Nov 20 17:10:10 2010 +0100
Fix images.
commit 09506b5428897fe0db9445270c331caca3f94134
Author: Jelmer Vernooij
Date: Sun Oct 31 21:44:31 2010 +0100
Add authors file.
---
Summary of changes:
AUTHORS|4 ++
Makefile |3 -
{tools => sambagtk}/images/crontab.png | Bin 5999 -> 5999 bytes
{tools => sambagtk}/images/group.png | Bin 13807 -> 13807 bytes
{tools => sambagtk}/images/registry-binary.png | Bin 6842 -> 6842 bytes
{tools => sambagtk}/images/registry-number.png | Bin 6474 -> 6474 bytes
{tools => sambagtk}/images/registry-string.png | Bin 5545 -> 5545 bytes
{tools => sambagtk}/images/registry.png| Bin 8070 -> 8070 bytes
{tools => sambagtk}/images/service.png | Bin 15889 -> 15889 bytes
{tools => sambagtk}/images/user.png| Bin 10903 -> 10903 bytes
sambagtk/pygwcrontab.py| 66 +++
setup.py | 13 +
12 files changed, 49 insertions(+), 37 deletions(-)
create mode 100644 AUTHORS
rename {tools => sambagtk}/images/crontab.png (100%)
rename {tools => sambagtk}/images/group.png (100%)
rename {tools => sambagtk}/images/registry-binary.png (100%)
rename {tools => sambagtk}/images/registry-number.png (100%)
rename {tools => sambagtk}/images/registry-string.png (100%)
rename {tools => sambagtk}/images/registry.png (100%)
rename {tools => sambagtk}/images/service.png (100%)
rename {tools => sambagtk}/images/user.png (100%)
create mode 100755 setup.py
hooks/post-receive
--
Samba GTK+ frontends
[offlist] Re: [SCM] Samba Shared Repository - branch v3-6-test updated
On Mon, 2010-12-13 at 19:21 -0800, Jeremy Allison wrote: > On Tue, Dec 14, 2010 at 04:20:48AM +0100, Jeremy Allison wrote: > > The branch, v3-6-test has been updated > >via 274fc73 Ensure we use vfs_fsp_stat(), not VFS_STAT directly, > > and store into fsp->fsp_name->st instead of a SMB_STRUCT_STAT on the stack. > >via 2ff6822 Merge branch 'v3-6-test' of > > ssh://git.samba.org/data/git/samba into v3-6-test > >via dc38715 smbtorture: correct error handling in BASE-OPEN. > > from 1ef50b1 Change crediting so that the credits are returned on > > the interim async response. (cherry picked from commit > > 58ebe1de32050fca71059c521f74488cfa5b3729) > > > > http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test > > > > > > - Log - > > commit 274fc732d751429c7a6ce9d4257b3bde68ffa8cd > > Author: Jeremy Allison > > Date: Mon Dec 13 19:17:57 2010 -0800 > > > > Ensure we use vfs_fsp_stat(), not VFS_STAT directly, and store into > > fsp->fsp_name->st > > instead of a SMB_STRUCT_STAT on the stack. > > > > Jeremy. > > (cherry picked from commit 68f8f220dcd20f4f04bc95916ae04da81a2cdda1) > > > > commit 2ff682226bed8ac1f55caee4aaa7cc1e8c0d1a47 > > Merge: dc38715527d282545ba7b05051bda70067fe5d6a > > 1ef50b15da1ca23afc2d3af6abe7f375e57946a1 > > Author: Jeremy Allison > > Date: Mon Dec 13 17:08:08 2010 -0800 > > > > Merge branch 'v3-6-test' of ssh://git.samba.org/data/git/samba into > > v3-6-test > > Arg. Sorry for the bloody merge commit. Didn't see that > one happen :-(. If you want to avoid merges you can use this alias that I use all the time: alias git-get='git fetch origin master && git rebase -i origin/master' Use git-get instead of git pull It will always cause an interactive rebase, but I find it the best way to avoid really annoying merges all over. Simo. -- Simo Sorce Samba Team GPL Compliance Officer Principal Software Engineer at Red Hat, Inc.
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0fe7440 Ensure we use vfs_fsp_stat(), not VFS_STAT directly, and
store into fsp->fsp_name->st instead of a SMB_STRUCT_STAT on the stack.
from 6510414 wintest Add testing of kerberos connections to Windows
members of an AD domain
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0fe744078d1ce9c93759ffed3f27db82ec8922ff
Author: Jeremy Allison
Date: Mon Dec 13 19:17:57 2010 -0800
Ensure we use vfs_fsp_stat(), not VFS_STAT directly, and store into
fsp->fsp_name->st
instead of a SMB_STRUCT_STAT on the stack.
Jeremy.
Autobuild-User: Jeremy Allison
Autobuild-Date: Tue Dec 14 05:05:50 CET 2010 on sn-devel-104
---
Summary of changes:
source3/smbd/vfs.c | 39 ---
1 files changed, 20 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index a35142e..3055e37 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -455,10 +455,10 @@ ssize_t vfs_pwrite_data(struct smb_request *req,
int vfs_allocate_file_space(files_struct *fsp, uint64_t len)
{
int ret;
- SMB_STRUCT_STAT st;
connection_struct *conn = fsp->conn;
uint64_t space_avail;
uint64_t bsize,dfree,dsize;
+ NTSTATUS status;
/*
* Actually try and commit the space on disk
@@ -474,19 +474,20 @@ int vfs_allocate_file_space(files_struct *fsp, uint64_t
len)
return -1;
}
- ret = SMB_VFS_FSTAT(fsp, &st);
- if (ret == -1)
- return ret;
+ status = vfs_stat_fsp(fsp);
+ if (!NT_STATUS_IS_OK(status)) {
+ return -1;
+ }
- if (len == (uint64_t)st.st_ex_size)
+ if (len == (uint64_t)fsp->fsp_name->st.st_ex_size)
return 0;
- if (len < (uint64_t)st.st_ex_size) {
+ if (len < (uint64_t)fsp->fsp_name->st.st_ex_size) {
/* Shrink - use ftruncate. */
DEBUG(10,("vfs_allocate_file_space: file %s, shrink. Current "
"size %.0f\n", fsp_str_dbg(fsp),
- (double)st.st_ex_size));
+ (double)fsp->fsp_name->st.st_ex_size));
contend_level2_oplocks_begin(fsp, LEVEL2_CONTEND_ALLOC_SHRINK);
@@ -508,7 +509,7 @@ int vfs_allocate_file_space(files_struct *fsp, uint64_t len)
if (!lp_strict_allocate(SNUM(fsp->conn)))
return 0;
- len -= st.st_ex_size;
+ len -= fsp->fsp_name->st.st_ex_size;
len /= 1024; /* Len is now number of 1k blocks needed. */
space_avail = get_dfree_info(conn, fsp->fsp_name->base_name, false,
&bsize, &dfree, &dsize);
@@ -518,7 +519,7 @@ int vfs_allocate_file_space(files_struct *fsp, uint64_t len)
DEBUG(10,("vfs_allocate_file_space: file %s, grow. Current size %.0f, "
"needed blocks = %.0f, space avail = %.0f\n",
- fsp_str_dbg(fsp), (double)st.st_ex_size, (double)len,
+ fsp_str_dbg(fsp), (double)fsp->fsp_name->st.st_ex_size,
(double)len,
(double)space_avail));
if (len > space_avail) {
@@ -605,36 +606,36 @@ int vfs_slow_fallocate(files_struct *fsp, SMB_OFF_T
offset, SMB_OFF_T len)
int vfs_fill_sparse(files_struct *fsp, SMB_OFF_T len)
{
int ret;
- SMB_STRUCT_STAT st;
+ NTSTATUS status;
SMB_OFF_T offset;
size_t num_to_write;
- ret = SMB_VFS_FSTAT(fsp, &st);
- if (ret == -1) {
- return ret;
+ status = vfs_stat_fsp(fsp);
+ if (!NT_STATUS_IS_OK(status)) {
+ return -1;
}
- if (len <= st.st_ex_size) {
+ if (len <= fsp->fsp_name->st.st_ex_size) {
return 0;
}
#ifdef S_ISFIFO
- if (S_ISFIFO(st.st_ex_mode)) {
+ if (S_ISFIFO(fsp->fsp_name->st.st_ex_mode)) {
return 0;
}
#endif
DEBUG(10,("vfs_fill_sparse: write zeros in file %s from len %.0f to "
"len %.0f (%.0f bytes)\n", fsp_str_dbg(fsp),
- (double)st.st_ex_size, (double)len,
- (double)(len - st.st_ex_size)));
+ (double)fsp->fsp_name->st.st_ex_size, (double)len,
+ (double)(len - fsp->fsp_name->st.st_ex_size)));
contend_level2_oplocks_begin(fsp, LEVEL2_CONTEND_FILL_SPARSE);
flush_write_cache(fsp, SIZECHANGE_FLUSH);
- offset = st.st_ex_size;
- num_to_write = len - st.st_ex_size;
+ offset = fsp->fsp_name->st.st_ex_size;
+ num_to_write = len - fsp->fsp_name->st.st_ex_size;
/* Only do this on non-stream file handles. */
if (fsp->base_fsp == NULL) {
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch v3-6-test updated
On Tue, Dec 14, 2010 at 04:20:48AM +0100, Jeremy Allison wrote: > The branch, v3-6-test has been updated >via 274fc73 Ensure we use vfs_fsp_stat(), not VFS_STAT directly, and > store into fsp->fsp_name->st instead of a SMB_STRUCT_STAT on the stack. >via 2ff6822 Merge branch 'v3-6-test' of > ssh://git.samba.org/data/git/samba into v3-6-test >via dc38715 smbtorture: correct error handling in BASE-OPEN. > from 1ef50b1 Change crediting so that the credits are returned on the > interim async response. (cherry picked from commit > 58ebe1de32050fca71059c521f74488cfa5b3729) > > http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test > > > - Log - > commit 274fc732d751429c7a6ce9d4257b3bde68ffa8cd > Author: Jeremy Allison > Date: Mon Dec 13 19:17:57 2010 -0800 > > Ensure we use vfs_fsp_stat(), not VFS_STAT directly, and store into > fsp->fsp_name->st > instead of a SMB_STRUCT_STAT on the stack. > > Jeremy. > (cherry picked from commit 68f8f220dcd20f4f04bc95916ae04da81a2cdda1) > > commit 2ff682226bed8ac1f55caee4aaa7cc1e8c0d1a47 > Merge: dc38715527d282545ba7b05051bda70067fe5d6a > 1ef50b15da1ca23afc2d3af6abe7f375e57946a1 > Author: Jeremy Allison > Date: Mon Dec 13 17:08:08 2010 -0800 > > Merge branch 'v3-6-test' of ssh://git.samba.org/data/git/samba into > v3-6-test Arg. Sorry for the bloody merge commit. Didn't see that one happen :-(. Sorry. Jeremy.
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 274fc73 Ensure we use vfs_fsp_stat(), not VFS_STAT directly, and
store into fsp->fsp_name->st instead of a SMB_STRUCT_STAT on the stack.
via 2ff6822 Merge branch 'v3-6-test' of
ssh://git.samba.org/data/git/samba into v3-6-test
via dc38715 smbtorture: correct error handling in BASE-OPEN.
from 1ef50b1 Change crediting so that the credits are returned on the
interim async response. (cherry picked from commit
58ebe1de32050fca71059c521f74488cfa5b3729)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 274fc732d751429c7a6ce9d4257b3bde68ffa8cd
Author: Jeremy Allison
Date: Mon Dec 13 19:17:57 2010 -0800
Ensure we use vfs_fsp_stat(), not VFS_STAT directly, and store into
fsp->fsp_name->st
instead of a SMB_STRUCT_STAT on the stack.
Jeremy.
(cherry picked from commit 68f8f220dcd20f4f04bc95916ae04da81a2cdda1)
commit 2ff682226bed8ac1f55caee4aaa7cc1e8c0d1a47
Merge: dc38715527d282545ba7b05051bda70067fe5d6a
1ef50b15da1ca23afc2d3af6abe7f375e57946a1
Author: Jeremy Allison
Date: Mon Dec 13 17:08:08 2010 -0800
Merge branch 'v3-6-test' of ssh://git.samba.org/data/git/samba into
v3-6-test
commit dc38715527d282545ba7b05051bda70067fe5d6a
Author: James Peach
Date: Mon Dec 6 11:27:31 2010 -0800
smbtorture: correct error handling in BASE-OPEN.
There are a number of cases in BASE-OPEN where an initial failure cascades
into multiple failures due to lack of cleanup between test phases. Fix
all these so that they close open file handles correctly. Replace
torture_comment with torture_result where appropriate so that the results
output contains a useful diagnostic.
---
Summary of changes:
source3/smbd/vfs.c | 39 ---
1 files changed, 20 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index a35142e..3055e37 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -455,10 +455,10 @@ ssize_t vfs_pwrite_data(struct smb_request *req,
int vfs_allocate_file_space(files_struct *fsp, uint64_t len)
{
int ret;
- SMB_STRUCT_STAT st;
connection_struct *conn = fsp->conn;
uint64_t space_avail;
uint64_t bsize,dfree,dsize;
+ NTSTATUS status;
/*
* Actually try and commit the space on disk
@@ -474,19 +474,20 @@ int vfs_allocate_file_space(files_struct *fsp, uint64_t
len)
return -1;
}
- ret = SMB_VFS_FSTAT(fsp, &st);
- if (ret == -1)
- return ret;
+ status = vfs_stat_fsp(fsp);
+ if (!NT_STATUS_IS_OK(status)) {
+ return -1;
+ }
- if (len == (uint64_t)st.st_ex_size)
+ if (len == (uint64_t)fsp->fsp_name->st.st_ex_size)
return 0;
- if (len < (uint64_t)st.st_ex_size) {
+ if (len < (uint64_t)fsp->fsp_name->st.st_ex_size) {
/* Shrink - use ftruncate. */
DEBUG(10,("vfs_allocate_file_space: file %s, shrink. Current "
"size %.0f\n", fsp_str_dbg(fsp),
- (double)st.st_ex_size));
+ (double)fsp->fsp_name->st.st_ex_size));
contend_level2_oplocks_begin(fsp, LEVEL2_CONTEND_ALLOC_SHRINK);
@@ -508,7 +509,7 @@ int vfs_allocate_file_space(files_struct *fsp, uint64_t len)
if (!lp_strict_allocate(SNUM(fsp->conn)))
return 0;
- len -= st.st_ex_size;
+ len -= fsp->fsp_name->st.st_ex_size;
len /= 1024; /* Len is now number of 1k blocks needed. */
space_avail = get_dfree_info(conn, fsp->fsp_name->base_name, false,
&bsize, &dfree, &dsize);
@@ -518,7 +519,7 @@ int vfs_allocate_file_space(files_struct *fsp, uint64_t len)
DEBUG(10,("vfs_allocate_file_space: file %s, grow. Current size %.0f, "
"needed blocks = %.0f, space avail = %.0f\n",
- fsp_str_dbg(fsp), (double)st.st_ex_size, (double)len,
+ fsp_str_dbg(fsp), (double)fsp->fsp_name->st.st_ex_size,
(double)len,
(double)space_avail));
if (len > space_avail) {
@@ -605,36 +606,36 @@ int vfs_slow_fallocate(files_struct *fsp, SMB_OFF_T
offset, SMB_OFF_T len)
int vfs_fill_sparse(files_struct *fsp, SMB_OFF_T len)
{
int ret;
- SMB_STRUCT_STAT st;
+ NTSTATUS status;
SMB_OFF_T offset;
size_t num_to_write;
- ret = SMB_VFS_FSTAT(fsp, &st);
- if (ret == -1) {
- return ret;
+ status = vfs_stat_fsp(fsp);
+ if (!NT_STATUS_IS_OK(status)) {
+ return -1;
}
- if (len <= st.st_ex_size) {
+ if (len <= fsp->fsp_name->st.st_ex_size) {
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6510414 wintest Add testing of kerberos connections to Windows
members of an AD domain
via d97492e s3-libsmb Improve error message when denying LM encryption
from f974e68 Change crediting so that the credits are returned on the
interim async response.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6510414ef0e48aaea9918cce87c0850d8f74fccd
Author: Andrew Bartlett
Date: Tue Dec 14 10:53:34 2010 +1100
wintest Add testing of kerberos connections to Windows members of an AD
domain
This improves the Samba3 wintest script to test against Windows7 and
WinXP domain members, and Windows7 standalone servers. To do this,
more of the samba4 script is put in common, and we splut up the
starting of the VMs from the preperation of the VM.
This also improves the nmblookup command parsing to cope with both the
samba3 and samba4 nmblookup commands.
A krb5.conf is now provided for both s3 and s4 tests.
Andrew Bartlett
Autobuild-User: Andrew Bartlett
Autobuild-Date: Tue Dec 14 01:54:46 CET 2010 on sn-devel-104
commit d97492e42a65540febae93dd0255b91d034f9def
Author: Andrew Bartlett
Date: Mon Dec 13 12:40:25 2010 +1100
s3-libsmb Improve error message when denying LM encryption
Now that 'client ntlmv2 auth = yes' is the default, make it more clear
what options a user may need to enable to get this to work.
Andrew Bartlett
---
Summary of changes:
source3/libsmb/cliconnect.c | 18 ++--
wintest/test-s3.py | 65 +-
wintest/test-s4-howto.py| 46 --
wintest/wintest.py | 45 +++--
4 files changed, 138 insertions(+), 36 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 65f6924..ec9ff58 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1399,15 +1399,15 @@ NTSTATUS cli_session_setup(struct cli_state *cli,
if (cli->protocol < PROTOCOL_NT1) {
if (!lp_client_lanman_auth() && passlen != 24 && (*pass)) {
- DEBUG(1, ("Server requested LM password but 'client
lanman auth'"
- " is disabled\n"));
+ DEBUG(1, ("Server requested LM password but 'client
lanman auth = no'"
+ " or 'client ntlmv2 auth = yes'\n"));
return NT_STATUS_ACCESS_DENIED;
}
if ((cli->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) ==
0 &&
!lp_client_plaintext_auth() && (*pass)) {
- DEBUG(1, ("Server requested plaintext password but "
- "'client plaintext auth' is disabled\n"));
+ DEBUG(1, ("Server requested LM password but 'client
plaintext auth = no'"
+ " or 'client ntlmv2 auth = yes'\n"));
return NT_STATUS_ACCESS_DENIED;
}
@@ -1433,8 +1433,8 @@ NTSTATUS cli_session_setup(struct cli_state *cli,
if ((cli->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) == 0) {
if (!lp_client_plaintext_auth() && (*pass)) {
- DEBUG(1, ("Server requested plaintext password but "
- "'client plaintext auth' is disabled\n"));
+ DEBUG(1, ("Server requested LM password but 'client
plaintext auth = no'"
+ " or 'client ntlmv2 auth = yes'\n"));
return NT_STATUS_ACCESS_DENIED;
}
return cli_session_setup_plaintext(cli, user, pass, workgroup);
@@ -1609,7 +1609,7 @@ struct tevent_req *cli_tcon_andx_create(TALLOC_CTX
*mem_ctx,
if (!lp_client_lanman_auth()) {
DEBUG(1, ("Server requested LANMAN password "
"(share-level security) but "
- "'client lanman auth' is disabled\n"));
+ "'client lanman auth = no' or 'client ntlmv2
auth = yes'\n"));
goto access_denied;
}
@@ -1625,8 +1625,8 @@ struct tevent_req *cli_tcon_andx_create(TALLOC_CTX
*mem_ctx,
== 0) {
if (!lp_client_plaintext_auth() && (*pass)) {
DEBUG(1, ("Server requested plaintext "
- "password but 'client plaintext "
- "auth' is disabled\n"));
+ "password but "
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f974e68 Change crediting so that the credits are returned on the
interim async response.
from 0414283 As we handle missing sendfile() inside lib/sendfile.c,
remove the WITH_SENDFILE ifdefs.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f974e68213177a1309d0fa3bf78221f7cac2127c
Author: Jeremy Allison
Date: Mon Dec 13 15:22:47 2010 -0800
Change crediting so that the credits are returned on the interim async
response.
Autobuild-User: Jeremy Allison
Autobuild-Date: Tue Dec 14 01:09:05 CET 2010 on sn-devel-104
---
Summary of changes:
source3/smbd/smb2_server.c | 11 +++
1 files changed, 7 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 91e00dc..8dbf327 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -902,9 +902,11 @@ NTSTATUS smbd_smb2_request_pending_queue(struct
smbd_smb2_request *req,
/* Match W2K8R2... */
SCVAL(body, 0x08, 0x21);
- /* Ensure we correctly go through crediting. */
+ /* Ensure we correctly go through crediting. Grant
+ the credits now, and zero credits on the final
+ response. */
smb2_set_operation_credit(req->sconn,
- NULL,
+ &req->in.vector[i],
&state->vector[1]);
if (req->do_signing) {
@@ -1443,9 +1445,10 @@ static NTSTATUS smbd_smb2_request_reply(struct
smbd_smb2_request *req)
smb2_setup_nbt_length(req->out.vector, req->out.vector_count);
- /* Set credit for this operation. */
+ /* Set credit for this operation (zero credits if this
+ is a final reply for an async operation). */
smb2_set_operation_credit(req->sconn,
- &req->in.vector[i],
+ req->async ? NULL : &req->in.vector[i],
&req->out.vector[i]);
if (req->do_signing) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 1ef50b1 Change crediting so that the credits are returned on the
interim async response. (cherry picked from commit
58ebe1de32050fca71059c521f74488cfa5b3729)
from a9ee3e2 As we handle missing sendfile() inside lib/sendfile.c,
remove the WITH_SENDFILE ifdefs. (cherry picked from commit
605afc631c212fc070ef5bb951f4d80d342f377d)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 1ef50b15da1ca23afc2d3af6abe7f375e57946a1
Author: Jeremy Allison
Date: Mon Dec 13 15:22:47 2010 -0800
Change crediting so that the credits are returned on the interim async
response.
(cherry picked from commit 58ebe1de32050fca71059c521f74488cfa5b3729)
---
Summary of changes:
source3/smbd/smb2_server.c | 11 +++
1 files changed, 7 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 91e00dc..8dbf327 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -902,9 +902,11 @@ NTSTATUS smbd_smb2_request_pending_queue(struct
smbd_smb2_request *req,
/* Match W2K8R2... */
SCVAL(body, 0x08, 0x21);
- /* Ensure we correctly go through crediting. */
+ /* Ensure we correctly go through crediting. Grant
+ the credits now, and zero credits on the final
+ response. */
smb2_set_operation_credit(req->sconn,
- NULL,
+ &req->in.vector[i],
&state->vector[1]);
if (req->do_signing) {
@@ -1443,9 +1445,10 @@ static NTSTATUS smbd_smb2_request_reply(struct
smbd_smb2_request *req)
smb2_setup_nbt_length(req->out.vector, req->out.vector_count);
- /* Set credit for this operation. */
+ /* Set credit for this operation (zero credits if this
+ is a final reply for an async operation). */
smb2_set_operation_credit(req->sconn,
- &req->in.vector[i],
+ req->async ? NULL : &req->in.vector[i],
&req->out.vector[i]);
if (req->do_signing) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0414283 As we handle missing sendfile() inside lib/sendfile.c,
remove the WITH_SENDFILE ifdefs.
via 6ce365b We need to start off with smb2.credits_granted == 0. That
way when processing the faked up SMB2 NegProt from the SMB1 packet we always
allocate one credit on reply.
via 27a47eb Remove extra unused credit arg. to
smbd_smb2_request_setup_out()
from 4ec6652 s4:dsdb:password_hash: verify content if the
BYPASS_PASSWORD_HASH control is used
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 041428352c36d548de738fbe971a1361e3a5402b
Author: Jeremy Allison
Date: Mon Dec 13 14:00:34 2010 -0800
As we handle missing sendfile() inside lib/sendfile.c, remove the
WITH_SENDFILE ifdefs.
Autobuild-User: Jeremy Allison
Autobuild-Date: Mon Dec 13 23:47:07 CET 2010 on sn-devel-104
commit 6ce365b238755ccd64b1c2aca0933f8e717300b0
Author: Jeremy Allison
Date: Mon Dec 13 13:34:50 2010 -0800
We need to start off with smb2.credits_granted == 0. That way
when processing the faked up SMB2 NegProt from the SMB1 packet we
always allocate one credit on reply.
Jeremy.
commit 27a47eb9fc869a1ee6c18f4165e1dccc9a8bee26
Author: Jeremy Allison
Date: Mon Dec 13 13:17:49 2010 -0800
Remove extra unused credit arg. to smbd_smb2_request_setup_out()
---
Summary of changes:
source3/smbd/reply.c |7 ---
source3/smbd/smb2_server.c | 11 ++-
source3/utils/status_profile.c |2 --
3 files changed, 6 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 5af5dac..9601f53 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2864,7 +2864,6 @@ static ssize_t fake_sendfile(files_struct *fsp, SMB_OFF_T
startpos,
return (ssize_t)nread;
}
-#if defined(WITH_SENDFILE)
/
Deal with the case of sendfile reading less bytes from the file than
requested. Fill with zeros (all we can do).
@@ -2934,7 +2933,6 @@ static void sendfile_short_send(files_struct *fsp,
SAFE_FREE(buf);
}
}
-#endif /* defined WITH_SENDFILE */
/
Return a readbraw error (4 bytes of zero).
@@ -2978,7 +2976,6 @@ static void send_file_readbraw(connection_struct *conn,
char *outbuf = NULL;
ssize_t ret=0;
-#if defined(WITH_SENDFILE)
/*
* We can only use sendfile on a non-chained packet
* but we can use on a non-oplocked file. tridge proved this
@@ -3053,7 +3050,6 @@ static void send_file_readbraw(connection_struct *conn,
}
normal_readbraw:
-#endif
outbuf = TALLOC_ARRAY(NULL, char, nread+4);
if (!outbuf) {
@@ -3528,7 +3524,6 @@ static void send_file_readX(connection_struct *conn,
struct smb_request *req,
goto nosendfile_read;
}
-#if defined(WITH_SENDFILE)
/*
* We can only use sendfile on a non-chained packet
* but we can use on a non-oplocked file. tridge proved this
@@ -3621,8 +3616,6 @@ static void send_file_readX(connection_struct *conn,
struct smb_request *req,
normal_read:
-#endif
-
if ((smb_maxcnt & 0xFF) > 0x1) {
uint8 headerbuf[smb_size + 2*12];
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 9ed74fc..91e00dc 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -111,7 +111,7 @@ static NTSTATUS smbd_initialize_smb2(struct
smbd_server_connection *sconn)
sconn->smb2.sessions.limit = 0xFFFE;
sconn->smb2.sessions.list = NULL;
sconn->smb2.seqnum_low = 0;
- sconn->smb2.credits_granted = 1;
+ sconn->smb2.credits_granted = 0;
sconn->smb2.max_credits = lp_smb2_max_credits();
sconn->smb2.credits_bitmap = bitmap_talloc(sconn,
2*sconn->smb2.max_credits);
if (sconn->smb2.credits_bitmap == NULL) {
@@ -453,7 +453,8 @@ static void smb2_set_operation_credit(struct
smbd_server_connection *sconn,
sconn->smb2.credits_granted));
if (credits_granted == 0 && sconn->smb2.credits_granted == 0) {
- /* Ensure the client credits can never drop to zero. */
+ /* First negprot packet, or ensure the client credits can
+ never drop to zero. */
credits_granted = 1;
}
@@ -481,7 +482,7 @@ static void smb2_calculate_credits(const struct
smbd_smb2_request *inreq,
}
}
-static NTSTATUS smbd_smb2_request_setup_out(struct smbd_smb2_request *req,
uint16_t creds)
+static NTSTATUS smbd_smb2_request_setup_out(struct smbd_smb2_request *req)
{
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via a9ee3e2 As we handle missing sendfile() inside lib/sendfile.c,
remove the WITH_SENDFILE ifdefs. (cherry picked from commit
605afc631c212fc070ef5bb951f4d80d342f377d)
from 280fd56 We need to start off with smb2.credits_granted == 0. That
way when processing the faked up SMB2 NegProt from the SMB1 packet we always
allocate one credit on reply.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit a9ee3e2e8f273f214e329fcbeb8645613ee55149
Author: Jeremy Allison
Date: Mon Dec 13 14:00:34 2010 -0800
As we handle missing sendfile() inside lib/sendfile.c, remove the
WITH_SENDFILE ifdefs.
(cherry picked from commit 605afc631c212fc070ef5bb951f4d80d342f377d)
---
Summary of changes:
source3/smbd/reply.c |7 ---
source3/utils/status_profile.c |2 --
2 files changed, 0 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 5af5dac..9601f53 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2864,7 +2864,6 @@ static ssize_t fake_sendfile(files_struct *fsp, SMB_OFF_T
startpos,
return (ssize_t)nread;
}
-#if defined(WITH_SENDFILE)
/
Deal with the case of sendfile reading less bytes from the file than
requested. Fill with zeros (all we can do).
@@ -2934,7 +2933,6 @@ static void sendfile_short_send(files_struct *fsp,
SAFE_FREE(buf);
}
}
-#endif /* defined WITH_SENDFILE */
/
Return a readbraw error (4 bytes of zero).
@@ -2978,7 +2976,6 @@ static void send_file_readbraw(connection_struct *conn,
char *outbuf = NULL;
ssize_t ret=0;
-#if defined(WITH_SENDFILE)
/*
* We can only use sendfile on a non-chained packet
* but we can use on a non-oplocked file. tridge proved this
@@ -3053,7 +3050,6 @@ static void send_file_readbraw(connection_struct *conn,
}
normal_readbraw:
-#endif
outbuf = TALLOC_ARRAY(NULL, char, nread+4);
if (!outbuf) {
@@ -3528,7 +3524,6 @@ static void send_file_readX(connection_struct *conn,
struct smb_request *req,
goto nosendfile_read;
}
-#if defined(WITH_SENDFILE)
/*
* We can only use sendfile on a non-chained packet
* but we can use on a non-oplocked file. tridge proved this
@@ -3621,8 +3616,6 @@ static void send_file_readX(connection_struct *conn,
struct smb_request *req,
normal_read:
-#endif
-
if ((smb_maxcnt & 0xFF) > 0x1) {
uint8 headerbuf[smb_size + 2*12];
diff --git a/source3/utils/status_profile.c b/source3/utils/status_profile.c
index d39ae2d..ec0ea03 100644
--- a/source3/utils/status_profile.c
+++ b/source3/utils/status_profile.c
@@ -81,11 +81,9 @@ bool status_profile_dump(bool verbose)
d_printf("pwrite_count: %u\n",
profile_p->syscall_pwrite_count);
d_printf("pwrite_time:%u\n",
profile_p->syscall_pwrite_time);
d_printf("pwrite_bytes: %u\n",
profile_p->syscall_pwrite_bytes);
-#ifdef WITH_SENDFILE
d_printf("sendfile_count: %u\n",
profile_p->syscall_sendfile_count);
d_printf("sendfile_time: %u\n",
profile_p->syscall_sendfile_time);
d_printf("sendfile_bytes: %u\n",
profile_p->syscall_sendfile_bytes);
-#endif
d_printf("lseek_count:%u\n",
profile_p->syscall_lseek_count);
d_printf("lseek_time: %u\n",
profile_p->syscall_lseek_time);
d_printf("rename_count: %u\n",
profile_p->syscall_rename_count);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 280fd56 We need to start off with smb2.credits_granted == 0. That
way when processing the faked up SMB2 NegProt from the SMB1 packet we always
allocate one credit on reply.
from 839196f Remove extra unused credit arg. to
smbd_smb2_request_setup_out() (cherry picked from commit
7a835a6b42c49d70b599ab7c651f7aa871d8c605)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 280fd56b17eeae82abc0676049ad19ebb74b93e8
Author: Jeremy Allison
Date: Mon Dec 13 13:34:50 2010 -0800
We need to start off with smb2.credits_granted == 0. That way
when processing the faked up SMB2 NegProt from the SMB1 packet we
always allocate one credit on reply.
Jeremy.
(cherry picked from commit 6ce365b238755ccd64b1c2aca0933f8e717300b0)
---
Summary of changes:
source3/smbd/smb2_server.c |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index d2baed7..91e00dc 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -111,7 +111,7 @@ static NTSTATUS smbd_initialize_smb2(struct
smbd_server_connection *sconn)
sconn->smb2.sessions.limit = 0xFFFE;
sconn->smb2.sessions.list = NULL;
sconn->smb2.seqnum_low = 0;
- sconn->smb2.credits_granted = 1;
+ sconn->smb2.credits_granted = 0;
sconn->smb2.max_credits = lp_smb2_max_credits();
sconn->smb2.credits_bitmap = bitmap_talloc(sconn,
2*sconn->smb2.max_credits);
if (sconn->smb2.credits_bitmap == NULL) {
@@ -453,7 +453,8 @@ static void smb2_set_operation_credit(struct
smbd_server_connection *sconn,
sconn->smb2.credits_granted));
if (credits_granted == 0 && sconn->smb2.credits_granted == 0) {
- /* Ensure the client credits can never drop to zero. */
+ /* First negprot packet, or ensure the client credits can
+ never drop to zero. */
credits_granted = 1;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 839196f Remove extra unused credit arg. to
smbd_smb2_request_setup_out() (cherry picked from commit
7a835a6b42c49d70b599ab7c651f7aa871d8c605)
via 663ed45 s3:selftest: fix knownfail for
samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old
from bccb901 s3-selftest: support differing VFSLIBDIR in autoconf and
waf build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 839196fddbce84fcb152e29f0b85d2b4499cc8be
Author: Jeremy Allison
Date: Mon Dec 13 13:17:49 2010 -0800
Remove extra unused credit arg. to smbd_smb2_request_setup_out()
(cherry picked from commit 7a835a6b42c49d70b599ab7c651f7aa871d8c605)
commit 663ed4583f60ad4a6c26514e072faf6b19e9dd42
Author: Stefan Metzmacher
Date: Mon Dec 13 12:04:28 2010 +0100
s3:selftest: fix knownfail for
samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old
The name is in lowercase since commit
35fbc7bbda5851f7172538f79fc79be201f1d521
(s4-smbtorture: Make test names lowercase and dot-separated.)
This should avoid intermittent failures in make test.
metze
Autobuild-User: Stefan Metzmacher
Autobuild-Date: Mon Dec 13 13:52:18 CET 2010 on sn-devel-104
(cherry picked from commit 4ce3b53f122afb1eb3eaa3fbc2b8ef7fa8d075f5)
---
Summary of changes:
source3/selftest/knownfail |2 +-
source3/smbd/smb2_server.c |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
index c00d031..54cffa8 100644
--- a/source3/selftest/knownfail
+++ b/source3/selftest/knownfail
@@ -1,5 +1,5 @@
.*printer.*print_test_extended # fails on some hosts due to timing issues ?
.*printer.*print_test # fails on some hosts due to timing issues ?
samba3.posix_s3.rap.printing # fails sometimes on sn-devel
-samba3.posix_s3.rpc.spoolss.*PRINTSERVER.enum_printers_old
+samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some
hosts due to timing issues ?
samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another
intermittent failure
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 9ed74fc..d2baed7 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -481,7 +481,7 @@ static void smb2_calculate_credits(const struct
smbd_smb2_request *inreq,
}
}
-static NTSTATUS smbd_smb2_request_setup_out(struct smbd_smb2_request *req,
uint16_t creds)
+static NTSTATUS smbd_smb2_request_setup_out(struct smbd_smb2_request *req)
{
struct iovec *vector;
int count;
@@ -2178,7 +2178,7 @@ void smbd_smb2_first_negprot(struct
smbd_server_connection *sconn,
return;
}
- status = smbd_smb2_request_setup_out(req, 1);
+ status = smbd_smb2_request_setup_out(req);
if (!NT_STATUS_IS_OK(status)) {
smbd_server_connection_terminate(sconn, nt_errstr(status));
return;
@@ -2233,7 +2233,7 @@ static void smbd_smb2_request_incoming(struct tevent_req
*subreq)
return;
}
- status = smbd_smb2_request_setup_out(req, 5);
+ status = smbd_smb2_request_setup_out(req);
if (!NT_STATUS_IS_OK(status)) {
smbd_server_connection_terminate(sconn, nt_errstr(status));
return;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4ec6652 s4:dsdb:password_hash: verify content if the
BYPASS_PASSWORD_HASH control is used
via a762e9c s4:ldap_controls: allow
DSDB_CONTROL_BYPASS_PASSWORD_HASH_OID over sockets.
via b85a0d9 s4:ldap_server: don't call ldb_req_mark_untrusted() on the
privileged ldapi socket
via 9a1fb13 s4:ldap_server: rename helper functions to ldapsrv_ prefix
and pass ldapsrv_call
via d7c536b s4:dsdb:util: dsdb_get_single_valued_attr() only needs a
const ldb_messages
from a5cfdde s3-waf: try to fix the build with snow leopard.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4ec66529e5d02cfe84b8c5a8c55ec9f88427e10f
Author: Stefan Metzmacher
Date: Tue Dec 7 16:10:49 2010 +0100
s4:dsdb:password_hash: verify content if the BYPASS_PASSWORD_HASH control
is used
Make it much harder to import bad data into the password attributes.
This isn't 100% safe, but much better than no checks.
metze
Autobuild-User: Stefan Metzmacher
Autobuild-Date: Mon Dec 13 16:17:36 CET 2010 on sn-devel-104
commit a762e9cab70f3ecc000b5dd20ce5f792963e8a52
Author: Stefan Metzmacher
Date: Wed Dec 1 20:36:43 2010 +0100
s4:ldap_controls: allow DSDB_CONTROL_BYPASS_PASSWORD_HASH_OID over sockets.
The DSDB_CONTROL_BYPASS_PASSWORD_HASH_OID control has to data attached to
it.
So we can allow it to be send over LDAP.
We'll accept this control over the privileged ldapi socket only.
metze
commit b85a0d929718681cfaf5cdb6d9b30b47386773e0
Author: Stefan Metzmacher
Date: Wed Dec 1 12:18:21 2010 +0100
s4:ldap_server: don't call ldb_req_mark_untrusted() on the privileged ldapi
socket
metze
commit 9a1fb1351f56d14171125378ca55e20c76b356bd
Author: Stefan Metzmacher
Date: Wed Dec 1 12:14:22 2010 +0100
s4:ldap_server: rename helper functions to ldapsrv_ prefix and pass
ldapsrv_call
metze
commit d7c536b8e4e58b13cfb1be80dcfaae8b6714a5a1
Author: Stefan Metzmacher
Date: Mon Dec 13 11:28:59 2010 +0100
s4:dsdb:util: dsdb_get_single_valued_attr() only needs a const ldb_messages
metze
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/password_hash.c | 397 +++-
source4/dsdb/samdb/ldb_modules/util.c |2 +-
source4/ldap_server/ldap_backend.c | 54 ++--
source4/ldap_server/ldap_server.c |8 +-
source4/ldap_server/ldap_server.h |1 +
source4/libcli/ldap/ldap_controls.c|4 +-
6 files changed, 438 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c
b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 4e2e96f..75df54b 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -151,6 +151,399 @@ struct setup_password_fields_io {
} g;
};
+static int password_hash_bypass(struct ldb_module *module, struct ldb_request
*request)
+{
+ struct ldb_context *ldb = ldb_module_get_ctx(module);
+ const struct ldb_message *msg;
+ struct ldb_message_element *nte;
+ struct ldb_message_element *lme;
+ struct ldb_message_element *nthe;
+ struct ldb_message_element *lmhe;
+ struct ldb_message_element *sce;
+
+ switch (request->operation) {
+ case LDB_ADD:
+ msg = request->op.add.message;
+ break;
+ case LDB_MODIFY:
+ msg = request->op.mod.message;
+ break;
+ default:
+ return ldb_next_request(module, request);
+ }
+
+ /* nobody must touch password histories and 'supplementalCredentials' */
+ nte = dsdb_get_single_valued_attr(msg, "unicodePwd",
+ request->operation);
+ lme = dsdb_get_single_valued_attr(msg, "dBCSPwd",
+ request->operation);
+ nthe = dsdb_get_single_valued_attr(msg, "ntPwdHistory",
+ request->operation);
+ lmhe = dsdb_get_single_valued_attr(msg, "lmPwdHistory",
+ request->operation);
+ sce = dsdb_get_single_valued_attr(msg, "supplementalCredentials",
+ request->operation);
+
+#define CHECK_HASH_ELEMENT(e, min, max) do {\
+ if (e && e->num_values) { \
+ unsigned int _count; \
+ if (e->num_values != 1) { \
+ return ldb_error(ldb, LDB_ERR_CONSTRAINT_VIOLATION, \
+"num_values != 1"); \
+ } \
+ if ((e->values[0].length % 16) != 0) { \
+ return ldb_error(
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via a966463 Fix bso#3185, return false when EOF is encountered in param
name.
from 50c8b42 s3: Fix bug 7843: Expand the local SAMs aliases
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit a9664633c667f6d02f33b951805882258604ff1c
Author: Holger Hetterich
Date: Sat Dec 4 18:18:50 2010 +0100
Fix bso#3185, return false when EOF is encountered in param name.
---
Summary of changes:
lib/util/params.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/params.c b/lib/util/params.c
index 80adc71..376fed4 100644
--- a/lib/util/params.c
+++ b/lib/util/params.c
@@ -358,7 +358,7 @@ static bool Parameter( myFILE *InFile, bool (*pfunc)(const
char *, const char *,
case EOF:
InFile->bufr[i] = '\0';
DEBUG(1,("%s Unexpected end-of-file at: %s\n", func, InFile->bufr ));
-return( true );
+return( false );
default:
if( isspace( c ) ) /* One ' ' per whitespace region. */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a5cfdde s3-waf: try to fix the build with snow leopard.
from 4ce3b53 s3:selftest: fix knownfail for
samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a5cfdde558314ea8bd8b9421d0fffd9acbfb7de9
Author: Günther Deschner
Date: Mon Dec 13 12:56:38 2010 +0100
s3-waf: try to fix the build with snow leopard.
Guenther
Autobuild-User: Günther Deschner
Autobuild-Date: Mon Dec 13 15:03:08 CET 2010 on sn-devel-104
---
Summary of changes:
source3/wscript |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript b/source3/wscript
index c02f2a2..684461f 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -317,6 +317,10 @@ return acl_get_perm_np(permset_d, perm);
'HAVE_ACL_GET_PERM_NP',
headers='sys/types.h sys/acl.h', link=True,
msg="Checking whether acl_get_perm_np() is available")
+else:
+conf.DEFINE('HAVE_NO_ACLS', 1)
+conf.SET_TARGET_TYPE('acl', 'EMPTY')
+conf.SET_TARGET_TYPE('attr', 'EMPTY')
else:
conf.DEFINE('HAVE_NO_ACLS', 1)
conf.SET_TARGET_TYPE('acl', 'EMPTY')
@@ -352,7 +356,7 @@ return acl_get_perm_np(permset_d, perm);
default_static_modules.extend(TO_LIST('rpc_rpcecho pdb_ads'))
default_shared_modules.extend(TO_LIST('charset_weird perfcount_test'))
-if Options.options.with_acl_support:
+if Options.options.with_acl_support and conf.CONFIG_SET('HAVE_POSIX_ACLS'):
default_static_modules.extend(TO_LIST('vfs_posixacl'))
if conf.CONFIG_SET('HAVE_DIRFD_DECL'):
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via bccb901 s3-selftest: support differing VFSLIBDIR in autoconf and
waf build.
via e082fb6 s3-waf: add -Wl,--export-dynamic to LDFLAGS.
via 73afa49 nss_wrapper: make nss_wrapper.pl executeable.
from ce4a7dc s4-smbtorture: Make test names lowercase and dot-separated.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit bccb901658ceb4ff301ac1e30b332342717f2f59
Author: Günther Deschner
Date: Fri Dec 10 17:15:18 2010 +0100
s3-selftest: support differing VFSLIBDIR in autoconf and waf build.
With this change make test in the s3 waf build (w/o s4 smbtorture yet)
works!
Guenther
Autobuild-User: Günther Deschner
Autobuild-Date: Mon Dec 13 13:06:05 CET 2010 on sn-devel-104
(cherry picked from commit a43a1d922611a0610f8d815285e91dff6d77d629)
commit e082fb6055e250aa298617ff4da9d0e6f18b8208
Author: Günther Deschner
Date: Thu Dec 9 15:44:30 2010 +0100
s3-waf: add -Wl,--export-dynamic to LDFLAGS.
Our binaries did not export symbols so e.g. smbd could not load vfs modules.
Patch from tridge.
We might remove this later on, once we decide to resolve all symbols and
fix all
dependencies in s3 modules.
Guenther
(cherry picked from commit b4d398f8e3f5f073f0424395b792c1487a2f2ca8)
commit 73afa49c2958ae2ac866e0ea1d66dcbc22011671
Author: Günther Deschner
Date: Thu Dec 9 15:33:25 2010 +0100
nss_wrapper: make nss_wrapper.pl executeable.
Guenther
(cherry picked from commit cb15d73c0bb8526b99f7f5067680a39bd8fbf03f)
---
Summary of changes:
selftest/target/Samba3.pm |2 +-
source3/Makefile.in|1 +
source3/selftest/wscript |1 +
source3/wscript|2 ++
4 files changed, 5 insertions(+), 1 deletions(-)
mode change 100644 => 100755 lib/nss_wrapper/nss_wrapper.pl
Changeset truncated at 500 lines:
diff --git a/lib/nss_wrapper/nss_wrapper.pl b/lib/nss_wrapper/nss_wrapper.pl
old mode 100644
new mode 100755
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 3d1ae4e..279fc65 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -356,7 +356,7 @@ sub provision($$)
my $prefix_abs = abs_path($prefix);
my $bindir_abs = abs_path($self->{bindir});
- my $vfs_modulesdir_abs = $bindir_abs;
+ my $vfs_modulesdir_abs = ($ENV{VFSLIBDIR} or $bindir_abs);
my @dirs = ();
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 61ec157..1525888 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3413,6 +3413,7 @@ test:: all torture timelimit
NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \
SELFTESTDIR="$(selftestdir)"
SELFTESTPREFIX="$(selftest_prefix)" \
SOURCEDIR="$(srcdir)" \
+ VFSLIBDIR="$(builddir)/bin" \
RUN_FROM_BUILD_FARM="$(RUN_FROM_BUILD_FARM)" \
SUBUNIT_FORMATTER="$(SUBUNIT_FORMATTER)" \
PERL="$(PERL)" PYTHON="$(PYTHON)" \
diff --git a/source3/selftest/wscript b/source3/selftest/wscript
index b3139d5..0e3ee9e 100644
--- a/source3/selftest/wscript
+++ b/source3/selftest/wscript
@@ -120,6 +120,7 @@ def cmd_testonly(opt):
# tell build system where to find config.h
os.environ['CONFIG_H'] = 'bin/default/source3/include/config.h'
+os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs')
st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')
if os.path.exists(st_done):
diff --git a/source3/wscript b/source3/wscript
index da9a9db..e38da59 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -96,6 +96,8 @@ def configure(conf):
conf.RECURSE('../lib/zlib')
conf.RECURSE('../libcli/smbreadline')
+conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
+
conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod mknod64')
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4ce3b53 s3:selftest: fix knownfail for
samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old
via 1865bdc s4:heimdal_build: replace '+' by '_' for vscripts in
HEIMDAL_LIBRARY()
from a43a1d9 s3-selftest: support differing VFSLIBDIR in autoconf and
waf build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4ce3b53f122afb1eb3eaa3fbc2b8ef7fa8d075f5
Author: Stefan Metzmacher
Date: Mon Dec 13 12:04:28 2010 +0100
s3:selftest: fix knownfail for
samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old
The name is in lowercase since commit
35fbc7bbda5851f7172538f79fc79be201f1d521
(s4-smbtorture: Make test names lowercase and dot-separated.)
This should avoid intermittent failures in make test.
metze
Autobuild-User: Stefan Metzmacher
Autobuild-Date: Mon Dec 13 13:52:18 CET 2010 on sn-devel-104
commit 1865bdc0f0129e03c4c71f1eef1c3d1bc55678e7
Author: Stefan Metzmacher
Date: Mon Dec 13 11:53:03 2010 +0100
s4:heimdal_build: replace '+' by '_' for vscripts in HEIMDAL_LIBRARY()
metze
---
Summary of changes:
source3/selftest/knownfail |2 +-
source4/heimdal_build/wscript_build |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
index c00d031..54cffa8 100644
--- a/source3/selftest/knownfail
+++ b/source3/selftest/knownfail
@@ -1,5 +1,5 @@
.*printer.*print_test_extended # fails on some hosts due to timing issues ?
.*printer.*print_test # fails on some hosts due to timing issues ?
samba3.posix_s3.rap.printing # fails sometimes on sn-devel
-samba3.posix_s3.rpc.spoolss.*PRINTSERVER.enum_printers_old
+samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some
hosts due to timing issues ?
samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another
intermittent failure
diff --git a/source4/heimdal_build/wscript_build
b/source4/heimdal_build/wscript_build
index 5607701..16af81a 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -242,8 +242,9 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
if bld.env.HAVE_LD_VERSION_SCRIPT:
vscript = "%s.vscript" % libname
+namespace = version.replace("-","_").replace("+","_").upper(),
HEIMDAL_GENERATOR(vscript,
- rule="echo %s \{ global: \*\; \}\; > ${TGT}" %
version.replace("-","_").upper(),
+ rule="echo %s \{ global: \*\; \}\; > ${TGT}" %
namespace,
group='vscripts',
target=vscript)
ldflags.append("-Wl,--version-script=%s/%s" %
(bld.path.abspath(bld.env), vscript))
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a43a1d9 s3-selftest: support differing VFSLIBDIR in autoconf and
waf build.
via b4d398f s3-waf: add -Wl,--export-dynamic to LDFLAGS.
via cb15d73 nss_wrapper: make nss_wrapper.pl executeable.
from 61d9aa5 build: remove -no-undefined and -as-needed on openbsd
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a43a1d922611a0610f8d815285e91dff6d77d629
Author: Günther Deschner
Date: Fri Dec 10 17:15:18 2010 +0100
s3-selftest: support differing VFSLIBDIR in autoconf and waf build.
With this change make test in the s3 waf build (w/o s4 smbtorture yet)
works!
Guenther
Autobuild-User: Günther Deschner
Autobuild-Date: Mon Dec 13 13:06:05 CET 2010 on sn-devel-104
commit b4d398f8e3f5f073f0424395b792c1487a2f2ca8
Author: Günther Deschner
Date: Thu Dec 9 15:44:30 2010 +0100
s3-waf: add -Wl,--export-dynamic to LDFLAGS.
Our binaries did not export symbols so e.g. smbd could not load vfs modules.
Patch from tridge.
We might remove this later on, once we decide to resolve all symbols and
fix all
dependencies in s3 modules.
Guenther
commit cb15d73c0bb8526b99f7f5067680a39bd8fbf03f
Author: Günther Deschner
Date: Thu Dec 9 15:33:25 2010 +0100
nss_wrapper: make nss_wrapper.pl executeable.
Guenther
---
Summary of changes:
selftest/target/Samba3.pm |2 +-
source3/Makefile.in|1 +
source3/selftest/wscript |1 +
source3/wscript|2 ++
4 files changed, 5 insertions(+), 1 deletions(-)
mode change 100644 => 100755 lib/nss_wrapper/nss_wrapper.pl
Changeset truncated at 500 lines:
diff --git a/lib/nss_wrapper/nss_wrapper.pl b/lib/nss_wrapper/nss_wrapper.pl
old mode 100644
new mode 100755
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 3d1ae4e..279fc65 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -356,7 +356,7 @@ sub provision($$)
my $prefix_abs = abs_path($prefix);
my $bindir_abs = abs_path($self->{bindir});
- my $vfs_modulesdir_abs = $bindir_abs;
+ my $vfs_modulesdir_abs = ($ENV{VFSLIBDIR} or $bindir_abs);
my @dirs = ();
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 61ec157..1525888 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3413,6 +3413,7 @@ test:: all torture timelimit
NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \
SELFTESTDIR="$(selftestdir)"
SELFTESTPREFIX="$(selftest_prefix)" \
SOURCEDIR="$(srcdir)" \
+ VFSLIBDIR="$(builddir)/bin" \
RUN_FROM_BUILD_FARM="$(RUN_FROM_BUILD_FARM)" \
SUBUNIT_FORMATTER="$(SUBUNIT_FORMATTER)" \
PERL="$(PERL)" PYTHON="$(PYTHON)" \
diff --git a/source3/selftest/wscript b/source3/selftest/wscript
index b3139d5..0e3ee9e 100644
--- a/source3/selftest/wscript
+++ b/source3/selftest/wscript
@@ -120,6 +120,7 @@ def cmd_testonly(opt):
# tell build system where to find config.h
os.environ['CONFIG_H'] = 'bin/default/source3/include/config.h'
+os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs')
st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')
if os.path.exists(st_done):
diff --git a/source3/wscript b/source3/wscript
index 2bf6fb8..c02f2a2 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -85,6 +85,8 @@ def configure(conf):
conf.RECURSE('../lib/zlib')
conf.RECURSE('../libcli/smbreadline')
+conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
+
conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod mknod64')
--
Samba Shared Repository
