Build status as of Wed Aug 12 06:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-08-11 00:00:18.0 -0600 +++ /home/build/master/cache/broken_results.txt 2009-08-12 00:00:04.0 -0600 @@ -1,4 +1,4 @@ -Build status as of Tue Aug 11 06:00:01 2009 +Build status as of Wed Aug 12 06:00:02 2009 Build counts: Tree Total Broken Panic @@ -8,15 +8,15 @@ ldb 32 32 0 libreplace 32 13 0 lorikeet 0 0 0 -pidl 23 3 0 +pidl 3 0 0 ppp 2 0 0 rsync33 13 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 1 0 0 -samba_3_master 30 26 5 -samba_3_next 28 25 1 -samba_4_0_test 33 28 2 +samba_3_current 30 26 0 +samba_3_master 31 28 6 +samba_3_next 31 29 1 +samba_4_0_test 33 30 2 talloc 32 32 0 tdb 30 30 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-948-ged051ce
The branch, master has been updated
via ed051ce424a93e08f59cd65ae0abe1a8926286a3 (commit)
via 011f103501e9465fbea56194910e082306bbf1f1 (commit)
from 3b5c6bc971c4e5c32b19072f0f54258792d00439 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ed051ce424a93e08f59cd65ae0abe1a8926286a3
Author: Andrew Tridgell tri...@samba.org
Date: Wed Aug 12 15:34:03 2009 +1000
try to give some hint as to what is causing NDR string errors
commit 011f103501e9465fbea56194910e082306bbf1f1
Author: Andrew Tridgell tri...@samba.org
Date: Wed Aug 12 15:33:37 2009 +1000
when we get an NDR error in the logs, it is useful to know where it happened
---
Summary of changes:
librpc/ndr/libndr.h |2 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 10 +-
source4/librpc/ndr/ndr_string.c | 16
3 files changed, 14 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 7109b73..53bed01 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -215,7 +215,7 @@ enum ndr_compression_alg {
#define NDR_PULL_NEED_BYTES(ndr, n) do { \
if ((n) ndr-data_size || ndr-offset + (n) ndr-data_size) { \
- return ndr_pull_error(ndr, NDR_ERR_BUFSIZE, Pull bytes %u,
(unsigned)n); \
+ return ndr_pull_error(ndr, NDR_ERR_BUFSIZE, Pull bytes %u
(%s), (unsigned)n, __location__); \
} \
} while(0)
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 3e724c9..cc8085a 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1669,7 +1669,7 @@ sub ParseUnionPushPrimitives()
}
if (! $have_default) {
$self-pidl(default:);
- $self-pidl(\treturn ndr_push_error($ndr, NDR_ERR_BAD_SWITCH,
\Bad switch value \%u\, level););
+ $self-pidl(\treturn ndr_push_error($ndr, NDR_ERR_BAD_SWITCH,
\Bad switch value \%u at \%s\, level, __location__););
}
$self-deindent;
$self-pidl(});
@@ -1705,7 +1705,7 @@ sub ParseUnionPushDeferred()
}
if (! $have_default) {
$self-pidl(default:);
- $self-pidl(\treturn ndr_push_error($ndr, NDR_ERR_BAD_SWITCH,
\Bad switch value \%u\, level););
+ $self-pidl(\treturn ndr_push_error($ndr, NDR_ERR_BAD_SWITCH,
\Bad switch value \%u at \%s\, level, __location__););
}
$self-deindent;
$self-pidl(});
@@ -1784,7 +1784,7 @@ sub ParseUnionPullPrimitives($)
if (defined($switch_type)) {
$self-pidl(NDR_CHECK(ndr_pull_$switch_type($ndr, NDR_SCALARS,
_level)););
$self-pidl(if (_level != level) {);
- $self-pidl(\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH,
\Bad switch value %u for $varname\, _level););
+ $self-pidl(\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH,
\Bad switch value %u for $varname at \%s\, _level, __location__););
$self-pidl(});
}
@@ -1814,7 +1814,7 @@ sub ParseUnionPullPrimitives($)
}
if (! $have_default) {
$self-pidl(default:);
- $self-pidl(\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH,
\Bad switch value \%u\, level););
+ $self-pidl(\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH,
\Bad switch value \%u at \%s\, level, __location__););
}
$self-deindent;
$self-pidl(});
@@ -1848,7 +1848,7 @@ sub ParseUnionPullDeferred()
}
if (! $have_default) {
$self-pidl(default:);
- $self-pidl(\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH,
\Bad switch value \%u\, level););
+ $self-pidl(\treturn ndr_pull_error($ndr, NDR_ERR_BAD_SWITCH,
\Bad switch value \%u at \%s\, level, __location__););
}
$self-deindent;
$self-pidl(});
diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c
index d6d9968..d4e04c1 100644
--- a/source4/librpc/ndr/ndr_string.c
+++ b/source4/librpc/ndr/ndr_string.c
@@ -87,7 +87,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull
*ndr, int ndr_flags,
(len2 +
c_len_term)*byte_mul,
(void **)as, ret, false))
{
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
- Bad character
conversion);
+ Bad character conversion
with flags 0x%x, flags);
}
}
NDR_CHECK(ndr_pull_advance(ndr, (len2 +
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-950-g5796da6
The branch, master has been updated
via 5796da6948379ffc101e813a4d68676e4a661c61 (commit)
via 6392f14cd78d3f0585615ccf0a6b0a961187f68f (commit)
from ed051ce424a93e08f59cd65ae0abe1a8926286a3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5796da6948379ffc101e813a4d68676e4a661c61
Author: Stefan Metzmacher me...@samba.org
Date: Wed Aug 12 10:24:01 2009 +0200
pidl: fix parse_idl test after idl.yp changes
We now generate 'FILE' and 'LINE' elements for each layer.
This change makes the expected PIDL trees human readable:-)
metze
commit 6392f14cd78d3f0585615ccf0a6b0a961187f68f
Author: Stefan Metzmacher me...@samba.org
Date: Wed Aug 12 10:01:12 2009 +0200
pidl: fix samba3-cli test after the async function were added
metze
---
Summary of changes:
pidl/tests/parse_idl.pl | 131 ++--
pidl/tests/samba3-cli.pl | 214 +-
2 files changed, 315 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/tests/parse_idl.pl b/pidl/tests/parse_idl.pl
index 9d43ddc..e06526d 100755
--- a/pidl/tests/parse_idl.pl
+++ b/pidl/tests/parse_idl.pl
@@ -113,52 +113,127 @@ testok cpp-quote, cpp_quote(\bla\);
my $x = Parse::Pidl::IDL::parse_string(interface foo { struct x {}; },
foo);
-is_deeply($x,
-[ { 'FILE' = 'foo', 'NAME' = 'foo', 'DATA' = [
-{ 'NAME' = 'x', 'TYPE' = 'STRUCT', ELEMENTS = [] } ],
-'TYPE' = 'INTERFACE', 'LINE' = 0 } ]);
+is_deeply($x, [ {
+ 'TYPE' = 'INTERFACE',
+ 'NAME' = 'foo',
+ 'DATA' = [ {
+ 'TYPE' = 'STRUCT',
+ 'NAME' = 'x',
+ 'ELEMENTS' = [],
+ 'FILE' = 'foo',
+ 'LINE' = 0
+ } ],
+ 'FILE' = 'foo',
+ 'LINE' = 0
+}]);
$x = Parse::Pidl::IDL::parse_string(interface foo { struct x; }, foo);
-is_deeply($x,
-[ { 'FILE' = 'foo', 'NAME' = 'foo', 'DATA' = [
-{ 'NAME' = 'x', 'TYPE' = 'STRUCT' } ],
-'TYPE' = 'INTERFACE', 'LINE' = 0 } ]);
+is_deeply($x, [ {
+ 'TYPE' = 'INTERFACE',
+ 'NAME' = 'foo',
+ 'DATA' = [ {
+ 'TYPE' = 'STRUCT',
+ 'NAME' = 'x',
+ 'FILE' = 'foo',
+ 'LINE' = 0
+ } ],
+ 'FILE' = 'foo',
+ 'LINE' = 0
+}]);
$x = Parse::Pidl::IDL::parse_string(cpp_quote(\foobar\), quote);
-is_deeply($x,
-[ { 'FILE' = 'quote', 'DATA' = 'foobar',
-'TYPE' = 'CPP_QUOTE', 'LINE' = 0 } ]);
+is_deeply($x, [ {
+ 'TYPE' = 'CPP_QUOTE',
+ 'DATA' = 'foobar',
+ 'FILE' = 'quote',
+ 'LINE' = 0
+}]);
# A typedef of a struct without body
$x = Parse::Pidl::IDL::parse_string(interface foo { typedef struct x y; },
foo);
-is_deeply($x,
-[ { 'FILE' = 'foo', 'NAME' = 'foo', 'DATA' = [
-{ 'FILE' = 'foo', 'LINE' = 0, 'NAME' = 'y', 'TYPE' =
'TYPEDEF', DATA = {
-TYPE = 'STRUCT', NAME = 'x' } } ],
-'TYPE' = 'INTERFACE', 'LINE' = 0 } ]);
+is_deeply($x, [ {
+ 'TYPE' = 'INTERFACE',
+ 'NAME' = 'foo',
+ 'DATA' = [ {
+ 'TYPE' = 'TYPEDEF',
+ 'NAME' = 'y',
+ 'DATA' = {
+ 'TYPE' = 'STRUCT',
+ 'NAME' = 'x',
+ 'FILE' = 'foo',
+ 'LINE' = 0,
+ },
+ 'FILE' = 'foo',
+ 'LINE' = 0,
+ } ],
+ 'FILE' = 'foo',
+ 'LINE' = 0
+}]);
# A typedef of a struct with empty body
$x = Parse::Pidl::IDL::parse_string(interface foo { typedef struct {} y; },
foo);
-is_deeply($x,
-[ { 'FILE' = 'foo', 'NAME' = 'foo', 'DATA' = [
-{ 'FILE' = 'foo', 'LINE' = 0, 'NAME' = 'y', 'TYPE' =
'TYPEDEF', DATA = { TYPE = 'STRUCT', ELEMENTS = [] } } ],
-'TYPE' = 'INTERFACE', 'LINE' = 0 } ]);
+is_deeply($x, [ {
+ 'TYPE' = 'INTERFACE',
+ 'NAME' = 'foo',
+ 'DATA' = [ {
+ 'TYPE' = 'TYPEDEF',
+ 'NAME' = 'y',
+ 'DATA' = {
+ 'TYPE' = 'STRUCT',
+ 'ELEMENTS' = [],
+ 'FILE' = 'foo',
+ 'LINE' = 0
+ },
+ 'FILE' = 'foo',
+ 'LINE' = 0
+ } ],
+ 'FILE' = 'foo',
+ 'LINE' = 0
+}]);
# A typedef of a bitmap with no body
$x = Parse::Pidl::IDL::parse_string(interface foo { typedef bitmap x y; },
foo);
-is_deeply($x,
-[ { 'FILE' = 'foo', 'NAME' = 'foo', 'DATA' = [
-{ 'FILE' = 'foo', 'LINE' = 0, 'NAME' = 'y', 'TYPE' =
'TYPEDEF', DATA = { TYPE = 'BITMAP', NAME = 'x' } } ],
-
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-957-g159a33a
The branch, master has been updated
via 159a33a7d4cb69b5487acb183cbf56a584048734 (commit)
via 9126b75aaed91d79c5b5388613a9cdbb6d898894 (commit)
via b255a41dca63a68f404e37b7eb46b54070bea466 (commit)
via fe767d4b70665bf8cf825455cb2c1db3fc2a1217 (commit)
via 7fc94932ad28880caed82155d65dcbfe8530e791 (commit)
via 8fcf1b988ad5c2338a75631696c32a31116708f1 (commit)
via c73984a5c9966f9c90549e753764ae071670e15f (commit)
from 5796da6948379ffc101e813a4d68676e4a661c61 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 159a33a7d4cb69b5487acb183cbf56a584048734
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Tue Aug 11 12:25:13 2009 +0200
s4:test for primaryGroupToken
Tests for the right behaviour of this introduced constructed attribute.
Since we don't support the read-only-ness of those attributes yet, I
commented
some lines out.
Also I had to add a function for python which converts domain SIDs in RIDs.
And a small fix for the groupType test.
commit 9126b75aaed91d79c5b5388613a9cdbb6d898894
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Mon Aug 10 13:19:18 2009 +0200
s4:samldb module - Remove duplicate line
commit b255a41dca63a68f404e37b7eb46b54070bea466
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Mon Aug 10 13:16:41 2009 +0200
s4:operational module - move and enhancements
This moves the operational LDB module to the right place under
dsdb/samdb/ldb_modules
(suggested by abartlet) and enhances it for supporting dynamic generated
primaryGroupToken for AD groups. This should fix bug #6466.
commit fe767d4b70665bf8cf825455cb2c1db3fc2a1217
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Mon Aug 10 11:06:33 2009 +0200
s4:pwsettings script - Fix a small glitch
This fixes the problem with the setting and getting of the minPwdAge and
maxPwdAge attributes. I wanted to handle them in days but forgot to add
conversions (from ticks (tenth of microsecond) - days and backwards).
commit 7fc94932ad28880caed82155d65dcbfe8530e791
Author: Kouhei Sutou k...@clear-code.com
Date: Mon Aug 10 12:18:58 2009 +0900
Rename ASN1_BITFIELD to ASN1_BIT_STRING.
X.690 uses BIT STRING not BIT FIELD.
commit 8fcf1b988ad5c2338a75631696c32a31116708f1
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Mon Aug 10 10:12:51 2009 +0200
torture/basic: in run_derefopen() the file could have been deleted before
the last unlink
Through a suggestion pointed out in bug #6622 the test file sometimes
doesn't exist on
the last turn anymore. So we haven't to fail here since it could have been
deleted by
a concurrent process (e.g. when the same test runs multiple times).
Therefore also
NT_STATUS_OBJECT_NAME_NOT_FOUND is an acceptable result.
commit c73984a5c9966f9c90549e753764ae071670e15f
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Sat Aug 8 13:50:10 2009 +0200
s4:AD LDIFs - More refactoring
This commit includes:
- Additional static object data in SAMBA 4's AD to start supporting of
- forest updates, - lost and found, - quotas on DS, - physical locations,
- licensing of sites, - subnets, - policies for WMI, - DNS entries in AD
- Reordering of provision*.ldif files to be able to find entries and make
future
additions easier
- Add comments in provision*.ldif files to point out where subentries are
located
when they are based in other LDIFs
- Removations of autogenerated cn attributes
---
Summary of changes:
lib/util/asn1.h|2 +-
source3/libsmb/clispnego.c |2 +-
source4/dsdb/samdb/ldb_modules/config.mk | 11 +
.../samdb/ldb_modules}/operational.c | 63 -
source4/dsdb/samdb/ldb_modules/samldb.c|1 -
source4/lib/ldb/config.mk | 12 -
source4/lib/ldb/tests/python/ldap.py | 68 -
source4/scripting/python/pyglue.c | 23 ++
source4/setup/provision.ldif | 36 +++
source4/setup/provision_configuration.ldif | 285 +---
source4/setup/provision_self_join.ldif |6 +-
source4/setup/provision_users.ldif | 61 -
source4/setup/pwsettings | 15 +-
source4/torture/basic/base.c |8 +-
14 files changed, 325 insertions(+), 268 deletions(-)
rename source4/{lib/ldb/modules = dsdb/samdb/ldb_modules}/operational.c (86%)
Changeset truncated at 500 lines:
diff --git a/lib/util/asn1.h b/lib/util/asn1.h
index b147ccc..4c66240 100644
--- a/lib/util/asn1.h
+++
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-958-gc7e2190
The branch, master has been updated
via c7e21907b4a620cf9646648f6f68cdb94ab5b590 (commit)
from 159a33a7d4cb69b5487acb183cbf56a584048734 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c7e21907b4a620cf9646648f6f68cdb94ab5b590
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Tue Aug 11 11:02:03 2009 +0200
ldb: Don't break the standalone LDB build (operational module removed)
---
Summary of changes:
source4/lib/ldb/ldb.mk |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/ldb.mk b/source4/lib/ldb/ldb.mk
index 4234fcc..4b73a45 100644
--- a/source4/lib/ldb/ldb.mk
+++ b/source4/lib/ldb/ldb.mk
@@ -20,8 +20,8 @@ COMMON_OBJ=$(COMDIR)/ldb.o $(COMDIR)/ldb_ldif.o \
$(COMDIR)/attrib_handlers.o $(COMDIR)/ldb_controls.o
$(COMDIR)/qsort.o
MODDIR=modules
-MODULES_OBJ=$(MODDIR)/operational.o $(MODDIR)/rdn_name.o \
- $(MODDIR)/paged_results.o $(MODDIR)/sort.o $(MODDIR)/asq.o
+MODULES_OBJ=$(MODDIR)/rdn_name.o ${MODDIR}/asq.o \
+ $(MODDIR)/paged_results.o $(MODDIR)/sort.o
NSSDIR=nssldb
NSS_OBJ= $(NSSDIR)/ldb-nss.o $(NSSDIR)/ldb-pwd.o $(NSSDIR)/ldb-grp.o
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-959-ge96338b
The branch, master has been updated via e96338bf2b9ff6767a54c6127cdda34591b98c0d (commit) from c7e21907b4a620cf9646648f6f68cdb94ab5b590 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e96338bf2b9ff6767a54c6127cdda34591b98c0d Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de Date: Tue Aug 11 11:08:05 2009 +0200 s4:operational - Remove some outdated comments --- Summary of changes: source4/dsdb/samdb/ldb_modules/operational.c | 12 1 files changed, 0 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c index 9cbe1db..7e3aec4 100644 --- a/source4/dsdb/samdb/ldb_modules/operational.c +++ b/source4/dsdb/samdb/ldb_modules/operational.c @@ -49,23 +49,11 @@ on modify we need to change whenChanged - - subschemaSubentry: HIDDEN, not-searchable, - points at DN CN=Aggregate,$SCHEMADN - - for this one we do the search as normal, then add the static - value if requested. How do we work out the $BASEDN from inside a - module? - structuralObjectClass: HIDDEN, CONSTRUCTED, not-searchable. always same as objectclass? for this one we do the search as normal, then if requested ask for objectclass, change the attribute name, and add it - allowedAttributesEffective: HIDDEN, CONSTRUCTED, not-searchable, - - list of attributes that can be modified - requires schema lookup - primaryGroupToken: HIDDEN, CONSTRUCTED, SEARCHABLE contains the RID of a certain group object -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-965-gf75934e
The branch, master has been updated
via f75934e2dc95d99dfbbc80f26eb3d1d1efe08604 (commit)
via 7229e9a4762f1fee15708ac20de9c40ce75f85a2 (commit)
via fedac72dfc4c220f653dd243de221dad56650bac (commit)
via d30b1c9fa9d03246124dc7db8bb583c260adb0d1 (commit)
via 14888c21acaf34da047937b29833d7788bafe11d (commit)
via 91d13b68be55728a85b3832e2da9267dbf4f2464 (commit)
from e96338bf2b9ff6767a54c6127cdda34591b98c0d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f75934e2dc95d99dfbbc80f26eb3d1d1efe08604
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 11 18:31:27 2009 +0200
s3:smbd: as check_path_syntax() changes the string, we need to copy the
string before
metze
commit 7229e9a4762f1fee15708ac20de9c40ce75f85a2
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 11 18:29:06 2009 +0200
s3:smbd: avoid 'goto out' in smbd_smb2_create_send()
metze
commit fedac72dfc4c220f653dd243de221dad56650bac
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 11 18:09:05 2009 +0200
s3:smbd: make sure we don't call conn_free() with a NULL pointer for SMB2
metze
commit d30b1c9fa9d03246124dc7db8bb583c260adb0d1
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 11 18:08:26 2009 +0200
s3:smbd: correctly invalidate vuids when SMB2 is used
metze
commit 14888c21acaf34da047937b29833d7788bafe11d
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 11 13:52:07 2009 +0200
s3:lib: map ECONNRESET to NT_STATUS_CONNECTION_RESET
metze
commit 91d13b68be55728a85b3832e2da9267dbf4f2464
Author: Matt Kraai mkr...@beckman.com
Date: Wed Aug 12 08:49:24 2009 +0200
libreplace: undef AI_ADDRCONFIG on QNX 6.3.0 (fix bug #6630)
Some of the functions in source3/lib/util_sock.c use AI_ADDRCONFIG. On QNX
6.3.0, this macro is defined but, if it's used, getaddrinfo will fail. This
prevents smbd from opening any sockets.
If I undefine AI_ADDRCONFIG on such systems and allow
lib/replace/system/network.h to define it to be 0, this works around the
issue.
Signed-off-by: Stefan Metzmacher me...@samba.org
---
Summary of changes:
lib/replace/system/network.h | 14 +
source3/lib/errmap_unix.c |3 ++
source3/smbd/password.c |4 +++
source3/smbd/smb2_create.c| 43 +
source3/smbd/smb2_sesssetup.c |1 +
source3/smbd/smb2_tcon.c |4 ++-
6 files changed, 47 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h
index c836410..1f51035 100644
--- a/lib/replace/system/network.h
+++ b/lib/replace/system/network.h
@@ -195,6 +195,20 @@ int rep_socketpair(int d, int type, int protocol, int
sv[2]);
#endif
#endif
+/*
+ * Some of the functions in source3/lib/util_sock.c use AI_ADDRCONFIG. On QNX
+ * 6.3.0, this macro is defined but, if it's used, getaddrinfo will fail. This
+ * prevents smbd from opening any sockets.
+ *
+ * If I undefine AI_ADDRCONFIG on such systems and define it to be 0,
+ * this works around the issue.
+ */
+#ifdef __QNX__
+#include sys/neutrino.h
+#if _NTO_VERSION == 630
+#undef AI_ADDRCONFIG
+#endif
+#endif
#ifndef AI_ADDRCONFIG
/*
* logic copied from AI_NUMERICHOST
diff --git a/source3/lib/errmap_unix.c b/source3/lib/errmap_unix.c
index 00c5475..d43598b 100644
--- a/source3/lib/errmap_unix.c
+++ b/source3/lib/errmap_unix.c
@@ -87,6 +87,9 @@ const struct unix_error_map unix_dos_nt_errmap[] = {
#ifdef ECONNABORTED
{ ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED},
#endif
+#ifdef ECONNRESET
+ { ECONNRESET, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_RESET},
+#endif
#ifdef ENODEV
{ ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST},
#endif
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index b1a7497..4c1cef4 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -128,6 +128,10 @@ void invalidate_vuid(struct smbd_server_connection *sconn,
uint16 vuid)
void invalidate_all_vuids(struct smbd_server_connection *sconn)
{
+ if (sconn-allow_smb2) {
+ return;
+ }
+
while (sconn-smb1.sessions.validated_users != NULL) {
invalidate_vuid(sconn,
sconn-smb1.sessions.validated_users-vuid);
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 1517ab8..fe414bb 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -272,7 +272,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
smbreq = smbd_smb2_fake_smb_request(smb2req);
if (tevent_req_nomem(smbreq, req)) {
- goto out;
+
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3651-g0a1b125
The branch, v3-2-test has been updated via 0a1b125ae4260de3cee6a92b19e3977d922a8c11 (commit) from 9bcfbccad5d5983cfa42f31f6394f03c4678e79a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 0a1b125ae4260de3cee6a92b19e3977d922a8c11 Author: Simo Sorce i...@samba.org Date: Sat Jul 12 22:44:15 2008 -0400 Fix bug #6628 - smbpassdb -a using rid algorithm with tdbsam passdb samu_set_unix() does not use the rid allocator, but forces to use the algoritmic allocator unconditionally, this is wrong and inconsistent. Use samu_alloc_rid_unix() instead. (If we create a new user we should do it in a way consistent with all other commands like pdbedit -a and net rpc user add.) (cherry picked from commit e1d4db8f55b25c7e9c408cb334fb89ccfd4c6565) Signed-off-by: Michael Adam ob...@samba.org This fixes bug #6628. --- Summary of changes: source/passdb/passdb.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c index e3a3d3c..125689c 100644 --- a/source/passdb/passdb.c +++ b/source/passdb/passdb.c @@ -675,7 +675,7 @@ NTSTATUS local_password_change(const char *user_name, return NT_STATUS_NO_MEMORY; } - result = samu_set_unix( sam_pass, pwd ); + result = samu_alloc_rid_unix( sam_pass, pwd ); DEBUGLEVEL = tmp_debug; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3652-g93de86c
The branch, v3-2-test has been updated via 93de86c490d5da0d0b3ecf363148ba3174997800 (commit) from 0a1b125ae4260de3cee6a92b19e3977d922a8c11 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 93de86c490d5da0d0b3ecf363148ba3174997800 Author: Karolin Seeger ksee...@samba.org Date: Wed Aug 12 13:58:12 2009 +0200 WHATSNEW: Update changes. Karolin --- Summary of changes: WHATSNEW.txt |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index f29e92c..3f15827 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -32,6 +32,8 @@ o Michael Adam ob...@samba.org * BUG 6387: Fix Winbind crash when multiple IDmappings exist in the LDAP directory. * BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache(). +* BUG 6628: 'smbpasswd -a' uses algorithmic rid base with + 'passdb backend = tdbsam'. * Prevent creation of keys containing the '/' character. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-13-30-gf46137e
The branch, v3-2-stable has been updated via f46137ef9485324c3789d7d28bc858fca4f7509e (commit) via 8080a0094317eb1e677b5523b5ff9f894a354caa (commit) from 7aea93c3d1060f277aab87e85fb3066b4f666109 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit f46137ef9485324c3789d7d28bc858fca4f7509e Author: Karolin Seeger ksee...@samba.org Date: Wed Aug 12 13:58:12 2009 +0200 WHATSNEW: Update changes. Karolin (cherry picked from commit 93de86c490d5da0d0b3ecf363148ba3174997800) commit 8080a0094317eb1e677b5523b5ff9f894a354caa Author: Simo Sorce i...@samba.org Date: Sat Jul 12 22:44:15 2008 -0400 Fix bug #6628 - smbpassdb -a using rid algorithm with tdbsam passdb samu_set_unix() does not use the rid allocator, but forces to use the algoritmic allocator unconditionally, this is wrong and inconsistent. Use samu_alloc_rid_unix() instead. (If we create a new user we should do it in a way consistent with all other commands like pdbedit -a and net rpc user add.) (cherry picked from commit e1d4db8f55b25c7e9c408cb334fb89ccfd4c6565) Signed-off-by: Michael Adam ob...@samba.org This fixes bug #6628. (cherry picked from commit 0a1b125ae4260de3cee6a92b19e3977d922a8c11) --- Summary of changes: WHATSNEW.txt |2 ++ source/passdb/passdb.c |2 +- 2 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index f29e92c..3f15827 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -32,6 +32,8 @@ o Michael Adam ob...@samba.org * BUG 6387: Fix Winbind crash when multiple IDmappings exist in the LDAP directory. * BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache(). +* BUG 6628: 'smbpasswd -a' uses algorithmic rid base with + 'passdb backend = tdbsam'. * Prevent creation of keys containing the '/' character. diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c index e3a3d3c..125689c 100644 --- a/source/passdb/passdb.c +++ b/source/passdb/passdb.c @@ -675,7 +675,7 @@ NTSTATUS local_password_change(const char *user_name, return NT_STATUS_NO_MEMORY; } - result = samu_set_unix( sam_pass, pwd ); + result = samu_alloc_rid_unix( sam_pass, pwd ); DEBUGLEVEL = tmp_debug; -- Samba Shared Repository
[SCM] Samba Shared Repository - annotated tag release-3-2-14 created - release-3-2-14
The annotated tag, release-3-2-14 has been created at 6a7f2784f0e76f4fc3b6fb22fd03eaeb6b15fda2 (tag) tagging f46137ef9485324c3789d7d28bc858fca4f7509e (commit) replaces release-3-2-13 tagged by Karolin Seeger on Wed Aug 12 14:19:51 2009 +0200 - Log - tag release-3-2-14 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iD8DBQBKgrN9bzORW2Vot+oRAnu9AJwM2EG58bPBj+FDZqDuksc0N4Vr8wCdFHOm lQc3OWvzpFFvIi/9bSDFXNw= =mT9G -END PGP SIGNATURE- Bo Yang (1): handling upn name Günther Deschner (3): s3-test: add RPC-SAMR-MACHINE-AUTH to list of tests to run against s3. s3-lsa: Fix _lsa_LookupNames2() server implementation which always returned a NULL sid_array since 3.2.0. s3-net: Fix bug 6340: don't segfault when cleartext trustdom pwd could not be retrieved. Jeremy Allison (5): Fix bug #6520 time stamps. Fix SAMR server for winbindd access. Ensure we allow MAX_ACCESS to be mapped to what we're giving Everyone. Jeremy. Fix bug #6421 - POSIX read-only open fails on read-only shares. The change to smbd/trans2.c opens up SETFILEINFO calls to POSIX_OPEN only. The change to first smbd/open.c closes 2 holes that would have been exposed by allowing POSIX_OPENS on readonly shares, and their ability to set arbitrary flags permutations. The O_CREAT - O_CREAT|O_EXCL change removes an illegal combination (O_EXCL without O_CREAT) that previously was being passed down to the open syscall. Jeremy. Fix bug #6476 - more then 3000 smbd-zombies in memory Fix bug #6487: Missing DFS call in trans2 mkdir call. (cherry picked from commit 1a0005e1c508cf3b170d1c7e43b94a47b2820506) Jim McDonough (1): Don't require Modify property perms to unjoin (bug #6481) net ads leave stopped working when modify properties permissions were not granted (meaning you had to be allowed to disable the account that you were about to delete). Karolin Seeger (13): s3/docs: Fix typos. s3/smbldap: Fix typo in debug message. VERSION: Raise version up to 3.2.14. WHATSNEW: Start WHATSNEW for 3.2.14. s3/docs: Add documentation for 'net sam rights'. s3/packaging: pam_winbind has been moved to section 8. s3/docs: Fix typo. s3/libsmb: Fix typo in error message. WHATSNEW: Update WHATSNEW. WHATSNEW: Update changes. WHATSNEW: Update changes since 3.2.13. WHATSNEW: Update changes. WHATSNEW: Update changes. Matt Kraai (1): s3/docs: Fix typo. Michael Adam (2): s3:winbind:idmap_ldap: fix a crash bug in idmap_ldap_unixids_to_sids (#6387) s3:passdb: fix bug #6509: use gid (not uid) cache in fetch_gid_from_cache(). Simo Sorce (1): Fix bug #6628 - smbpassdb -a using rid algorithm with tdbsam passdb Stefan Metzmacher (2): s3:util: let parent_dirname() correctly return toplevel filenames s3:winbindd: raise the timeout for lsa_Lookup*() calls from 10 to 35 seconds. Volker Lendecke (1): s3/lanman: Workaround for KB932762. --- -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3653-gbdccf98
The branch, v3-2-test has been updated via bdccf9831ae530b55d1819c040a3ee5448b24ac3 (commit) from 93de86c490d5da0d0b3ecf363148ba3174997800 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit bdccf9831ae530b55d1819c040a3ee5448b24ac3 Author: Karolin Seeger ksee...@samba.org Date: Wed Aug 12 14:31:54 2009 +0200 WHATSNEW: Actually it was Simo's patch... Karolin --- Summary of changes: WHATSNEW.txt |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 3f15827..631e1d6 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -95,6 +95,8 @@ o Sébastien Prud'homme sebastien.prudho...@gmail.com o Simo Sorce sso...@redhat.com +* BUG 6628: 'smbpasswd -a' uses algorithmic rid base with + 'passdb backend = tdbsam'. * Avoid duplicate ACEs. * Fix profile ACLs in some corner cases. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-14-1-ge8be79d
The branch, v3-2-stable has been updated via e8be79de16329360b15827d3cbf65c09772a3788 (commit) from f46137ef9485324c3789d7d28bc858fca4f7509e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit e8be79de16329360b15827d3cbf65c09772a3788 Author: Karolin Seeger ksee...@samba.org Date: Wed Aug 12 14:31:54 2009 +0200 WHATSNEW: Actually it was Simo's patch... Karolin (cherry picked from commit bdccf9831ae530b55d1819c040a3ee5448b24ac3) --- Summary of changes: WHATSNEW.txt |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 3f15827..631e1d6 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -95,6 +95,8 @@ o Sébastien Prud'homme sebastien.prudho...@gmail.com o Simo Sorce sso...@redhat.com +* BUG 6628: 'smbpasswd -a' uses algorithmic rid base with + 'passdb backend = tdbsam'. * Avoid duplicate ACEs. * Fix profile ACLs in some corner cases. -- Samba Shared Repository
[SCM] Samba Shared Repository - annotated tag release-3-2-14 updated - release-3-2-14
The annotated tag, release-3-2-14 has been updated to 8431554e1f0c88ff9eec3166ec5b5578568c00ab (tag) from 6a7f2784f0e76f4fc3b6fb22fd03eaeb6b15fda2 (which is now obsolete) tagging e8be79de16329360b15827d3cbf65c09772a3788 (commit) replaces release-3-2-13 tagged by Karolin Seeger on Wed Aug 12 14:34:48 2009 +0200 - Log - tag release-3-2-14 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iD8DBQBKgrcBbzORW2Vot+oRAk9eAKCYY+Rsaws0OxA6uXSwoTgl+tO+tgCguW20 pkJnB/o05r7dt23TCZJPqqk= =hL78 -END PGP SIGNATURE- Bo Yang (1): handling upn name Günther Deschner (3): s3-test: add RPC-SAMR-MACHINE-AUTH to list of tests to run against s3. s3-lsa: Fix _lsa_LookupNames2() server implementation which always returned a NULL sid_array since 3.2.0. s3-net: Fix bug 6340: don't segfault when cleartext trustdom pwd could not be retrieved. Jeremy Allison (5): Fix bug #6520 time stamps. Fix SAMR server for winbindd access. Ensure we allow MAX_ACCESS to be mapped to what we're giving Everyone. Jeremy. Fix bug #6421 - POSIX read-only open fails on read-only shares. The change to smbd/trans2.c opens up SETFILEINFO calls to POSIX_OPEN only. The change to first smbd/open.c closes 2 holes that would have been exposed by allowing POSIX_OPENS on readonly shares, and their ability to set arbitrary flags permutations. The O_CREAT - O_CREAT|O_EXCL change removes an illegal combination (O_EXCL without O_CREAT) that previously was being passed down to the open syscall. Jeremy. Fix bug #6476 - more then 3000 smbd-zombies in memory Fix bug #6487: Missing DFS call in trans2 mkdir call. (cherry picked from commit 1a0005e1c508cf3b170d1c7e43b94a47b2820506) Jim McDonough (1): Don't require Modify property perms to unjoin (bug #6481) net ads leave stopped working when modify properties permissions were not granted (meaning you had to be allowed to disable the account that you were about to delete). Karolin Seeger (14): s3/docs: Fix typos. s3/smbldap: Fix typo in debug message. VERSION: Raise version up to 3.2.14. WHATSNEW: Start WHATSNEW for 3.2.14. s3/docs: Add documentation for 'net sam rights'. s3/packaging: pam_winbind has been moved to section 8. s3/docs: Fix typo. s3/libsmb: Fix typo in error message. WHATSNEW: Update WHATSNEW. WHATSNEW: Update changes. WHATSNEW: Update changes since 3.2.13. WHATSNEW: Update changes. WHATSNEW: Update changes. WHATSNEW: Actually it was Simo's patch... Matt Kraai (1): s3/docs: Fix typo. Michael Adam (2): s3:winbind:idmap_ldap: fix a crash bug in idmap_ldap_unixids_to_sids (#6387) s3:passdb: fix bug #6509: use gid (not uid) cache in fetch_gid_from_cache(). Simo Sorce (1): Fix bug #6628 - smbpassdb -a using rid algorithm with tdbsam passdb Stefan Metzmacher (2): s3:util: let parent_dirname() correctly return toplevel filenames s3:winbindd: raise the timeout for lsa_Lookup*() calls from 10 to 35 seconds. Volker Lendecke (1): s3/lanman: Workaround for KB932762. --- -- Samba Shared Repository
svn commit: samba-web r1317 - in trunk: . history
Author: kseeger Date: 2009-08-12 07:27:58 -0600 (Wed, 12 Aug 2009) New Revision: 1317 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1317 Log: Announce Samba 3.2.14 Karolin Added: trunk/history/samba-3.2.14.html Modified: trunk/header_columns.html trunk/history/header_history.html trunk/index.html Changeset: Modified: trunk/header_columns.html === --- trunk/header_columns.html 2009-08-07 21:26:34 UTC (rev 1316) +++ trunk/header_columns.html 2009-08-12 13:27:58 UTC (rev 1317) @@ -141,9 +141,9 @@ lia href=/samba/history/samba-3.3.7.htmlRelease Notes 3.3.7/a/li lia href=/samba/ftp/stable/samba-3.3.7.tar.ascSignature 3.3.7/a/li -lia href=/samba/ftp/stable/samba-3.2.13.tar.gzSamba 3.2.13 (gzipped)/a/li -lia href=/samba/history/samba-3.2.13.htmlRelease Notes 3.2.13/a/li -lia href=/samba/ftp/stable/samba-3.2.13.tar.ascSignature 3.2.13/a/li +lia href=/samba/ftp/stable/samba-3.2.14.tar.gzSamba 3.2.14 (gzipped)/a/li +lia href=/samba/history/samba-3.2.14.htmlRelease Notes 3.2.14/a/li +lia href=/samba/ftp/stable/samba-3.2.14.tar.ascSignature 3.2.14/a/li lia href=/samba/ftp/stable/samba-3.0.36.tar.gzSamba 3.0.36 (gzipped)/a/li lia href=/samba/history/samba-3.0.36.htmlRelease Notes 3.0.36/a/li lia href=/samba/ftp/stable/samba-3.0.36.tar.ascSignature 3.0.36/a/li Modified: trunk/history/header_history.html === --- trunk/history/header_history.html 2009-08-07 21:26:34 UTC (rev 1316) +++ trunk/history/header_history.html 2009-08-12 13:27:58 UTC (rev 1317) @@ -86,6 +86,7 @@ lia href=samba-3.3.2.htmlsamba-3.3.2/a/li lia href=samba-3.3.1.htmlsamba-3.3.1/a/li lia href=samba-3.3.0.htmlsamba-3.3.0/a/li +lia href=samba-3.2.14.htmlsamba-3.2.14/a/li lia href=samba-3.2.13.htmlsamba-3.2.13/a/li lia href=samba-3.2.12.htmlsamba-3.2.12/a/li lia href=samba-3.2.11.htmlsamba-3.2.11/a/li Added: trunk/history/samba-3.2.14.html === --- trunk/history/samba-3.2.14.html (rev 0) +++ trunk/history/samba-3.2.14.html 2009-08-12 13:27:58 UTC (rev 1317) @@ -0,0 +1,127 @@ +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN +http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; +html xmlns=http://www.w3.org/1999/xhtml; + +head +titleSamba - Release Notes Archive/title +/head + +body + + H2Samba 3.2.14 Available for Download/H2 + +p +pre + == + Release Notes for Samba 3.2.14 + August 12, 2009 + == + + +This is the last maintenance release of the Samba 3.2 series. + +Please note that this is the last bugfix release of the Samba 3.2 series! +There will security releases on demand only. Please see +http://wiki.samba.org/index.php/Samba3_Release_Planning for information +on current releases. + +Major enhancements in 3.2.14 include: + +o Fix SAMR access checks (e.g. bugs #6089 and #6112). +o Fix 'force user' (bug #6291). +o Improve Win7 support (bug #6099). +o Fix posix ACLs when setting an ACL without explicit ACE for the + owner (bug #2346). + + +## +Changes +### + +Changes since 3.2.13 + + + +o Michael Adam lt;ob...@samba.orggt; +* BUG 6387: Fix Winbind crash when multiple IDmappings exist in the + LDAP directory. +* BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache(). +* BUG 6628: 'smbpasswd -a' uses algorithmic rid base with + 'passdb backend = tdbsam'. +* Prevent creation of keys containing the '/' character. + + +o Jeremy Allison lt;j...@samba.orggt; +* BUG 6089: Fix SAMR access checks. +* BUG 6112: Fix SAMR access checks. +* BUG 6279: Fix Winbind crash. +* BUG 6291: Fix 'force user'. +* BUG 6099: Try to fix domain join of Win7 Beta. +* BUG 6386: Groupdb mapping fix. +* BUG 6421: Fix POSIX read-only open on read-only shares. +* BUG 6476: Fix more smbd-zombies in memory. +* BUG 6488: acl_group_override() call in posix acls references an + uninitialized variable. +* BUG 6504: Fix SAMR server for Winbind access. +* BUG 6520: Fix time stamps. +* Fix join of Windows 7 RC to a Samba3 DC. +* Fix bug in processing of open modes in POSIX open. + + +o Guuml;nther Deschner lt;g...@samba.orggt; +* BUG 6301: Fix samr_ConnectVersion enum which is 32bit not 16bit. +* BUG 6340: Don't segfault when cleartext trustdom pwd could not be + retrieved. +* BUG 6372: Fix usermanager only displaying 1024 groups and aliases. +* BUG 6465: Fix enum_aliasmem in ldb branch. +* BUG 6484: Fix searching for users while adding them to
svn commit: samba-web r1318 - in trunk: .
Author: kseeger Date: 2009-08-12 07:33:23 -0600 (Wed, 12 Aug 2009) New Revision: 1318 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1318 Log: Fix typos Karolin Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2009-08-12 13:27:58 UTC (rev 1317) +++ trunk/index.html2009-08-12 13:33:23 UTC (rev 1318) @@ -29,7 +29,7 @@ h412 August 2009/h4 p class=headlineSamba 3.2.14 Available for Download/p -pThis is the last bugfix release of the Samba 3.2 series/p +pThis is the last bug fix release of the Samba 3.2 series/p pThe uncompressed tarballs and patch files have been signed using GnuPG (ID 6568B7EA). The source code can be @@ -38,7 +38,7 @@ is also available. See a href=/samba/history/samba-3.2.14.html the release notes for more info/a./p -pPlease note, that this is the last bugfix release of the Samba 3.2 series! +pPlease note, that this is the last bug fix release of the Samba 3.2 series! There will be security releases on demand only. For more information on current Samba releases, please see the a href=http://wiki.samba.org/index.php/Samba3_Release_Planning;Release
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1208-gc704e22
The branch, v3-4-test has been updated via c704e22806198a620d7e058c8d69c144ce096837 (commit) from 80cedd944c3bcee7fe44787c9730b564b2d86726 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit c704e22806198a620d7e058c8d69c144ce096837 Author: Jeremy Allison j...@samba.org Date: Thu Aug 6 13:11:20 2009 -0700 Correctly implement SMB_INFO_STANDARD setfileinfo. Fixes bug #6593. Jeremy. --- Summary of changes: source3/smbd/trans2.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index cae13df..7173796 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -5702,13 +5702,13 @@ static NTSTATUS smb_set_info_standard(connection_struct *conn, } /* create time */ - ft.create_time = interpret_long_date(pdata); + ft.create_time = convert_time_t_to_timespec(srv_make_unix_date2(pdata)); /* access time */ - ft.atime = interpret_long_date(pdata + 8); + ft.atime = convert_time_t_to_timespec(srv_make_unix_date2(pdata+4)); /* write time */ - ft.mtime = interpret_long_date(pdata + 16); + ft.mtime = convert_time_t_to_timespec(srv_make_unix_date2(pdata+8)); DEBUG(10,(smb_set_info_standard: file %s\n, fname ? fname : fsp-fsp_name )); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1209-g174356c
The branch, v3-4-test has been updated via 174356c6618f8704b968ccfb46b04233bf7dfa40 (commit) from c704e22806198a620d7e058c8d69c144ce096837 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 174356c6618f8704b968ccfb46b04233bf7dfa40 Author: Karolin Seeger ksee...@samba.org Date: Wed May 13 10:07:56 2009 +0200 s3/packaging: Fix build on RHEL when ccache is not available. This fixes bug #5832. Patch was provided by D.L. Meyer dlmeyer [at] uiuc.edu. Thanks for reporting and providing the patch! Karolin (cherry picked from commit 42e0cb8c0a1b8470ac8e9ad1c5a741e299debb8f) (cherry picked from commit b2205a7697598729f85cb767621b8c610654053c) --- Summary of changes: packaging/RHEL/samba.spec.tmpl |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index eb85f9c..4467963 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -122,8 +122,7 @@ cd source3 # RPM_OPT_FLAGS=$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 ## check for ccache - ccache -h 21 /dev/null -if [ $? -eq 0 ]; then +if [ $(which ccache 2 /dev/null) != ]; then CC=ccache gcc else CC=gcc -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-966-g31e57ab
The branch, master has been updated
via 31e57ab1e5d676a60fada9b3de7acdf3fd415dbb (commit)
from f75934e2dc95d99dfbbc80f26eb3d1d1efe08604 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 31e57ab1e5d676a60fada9b3de7acdf3fd415dbb
Author: Kai Blin k...@samba.org
Date: Wed Aug 12 17:59:46 2009 +0200
librpc: rerun make idl_full
---
Summary of changes:
librpc/gen_ndr/ndr_dcerpc.c |8 +-
librpc/gen_ndr/ndr_dfs.c | 20 ++--
librpc/gen_ndr/ndr_drsblobs.c| 76 +-
librpc/gen_ndr/ndr_drsuapi.c | 270 +-
librpc/gen_ndr/ndr_dssetup.c | 10 +-
librpc/gen_ndr/ndr_echo.c| 20 ++--
librpc/gen_ndr/ndr_lsa.c | 32 ++--
librpc/gen_ndr/ndr_named_pipe_auth.c | 20 ++--
librpc/gen_ndr/ndr_nbt.c | 40 +++---
librpc/gen_ndr/ndr_netlogon.c| 90 ++--
librpc/gen_ndr/ndr_samr.c| 80 +-
librpc/gen_ndr/ndr_spoolss.c | 56
librpc/gen_ndr/ndr_srvsvc.c | 34 ++--
librpc/gen_ndr/ndr_wkssvc.c | 52
librpc/gen_ndr/ndr_xattr.c | 20 ++--
15 files changed, 414 insertions(+), 414 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_dcerpc.c b/librpc/gen_ndr/ndr_dcerpc.c
index c510967..9596440 100644
--- a/librpc/gen_ndr/ndr_dcerpc.c
+++ b/librpc/gen_ndr/ndr_dcerpc.c
@@ -1356,7 +1356,7 @@ static enum ndr_err_code ndr_push_dcerpc_payload(struct
ndr_push *ndr, int ndr_f
break; }
default:
- return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u, level);
+ return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u at %s, level, __location__);
}
}
if (ndr_flags NDR_BUFFERS) {
@@ -1424,7 +1424,7 @@ static enum ndr_err_code ndr_push_dcerpc_payload(struct
ndr_push *ndr, int ndr_f
break;
default:
- return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u, level);
+ return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u at %s, level, __location__);
}
}
return NDR_ERR_SUCCESS;
@@ -1517,7 +1517,7 @@ static enum ndr_err_code ndr_pull_dcerpc_payload(struct
ndr_pull *ndr, int ndr_f
break; }
default:
- return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u, level);
+ return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u at %s, level, __location__);
}
}
if (ndr_flags NDR_BUFFERS) {
@@ -1584,7 +1584,7 @@ static enum ndr_err_code ndr_pull_dcerpc_payload(struct
ndr_pull *ndr, int ndr_f
break;
default:
- return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u, level);
+ return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u at %s, level, __location__);
}
}
return NDR_ERR_SUCCESS;
diff --git a/librpc/gen_ndr/ndr_dfs.c b/librpc/gen_ndr/ndr_dfs.c
index 6e36cb3..bf1d300 100644
--- a/librpc/gen_ndr/ndr_dfs.c
+++ b/librpc/gen_ndr/ndr_dfs.c
@@ -1614,7 +1614,7 @@ static enum ndr_err_code ndr_push_dfs_Info(struct
ndr_push *ndr, int ndr_flags,
break; }
default:
- return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u, level);
+ return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u at %s, level, __location__);
}
}
if (ndr_flags NDR_BUFFERS) {
@@ -1711,7 +1711,7 @@ static enum ndr_err_code ndr_push_dfs_Info(struct
ndr_push *ndr, int ndr_flags,
break;
default:
- return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u, level);
+ return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH,
Bad switch value %u at %s, level, __location__);
}
}
return NDR_ERR_SUCCESS;
@@ -1740,7 +1740,7 @@ static enum ndr_err_code ndr_pull_dfs_Info(struct
ndr_pull *ndr, int ndr_flags,
if (ndr_flags NDR_SCALARS) {
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, _level));
if (_level != level) {
- return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, Bad
switch value %u for r, _level);
+ return
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-967-g1df883a
The branch, master has been updated
via 1df883aa39ce69b040f9d9e72125bf4b80c714a9 (commit)
from 31e57ab1e5d676a60fada9b3de7acdf3fd415dbb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1df883aa39ce69b040f9d9e72125bf4b80c714a9
Author: Stefan Metzmacher me...@samba.org
Date: Wed Aug 12 17:52:55 2009 +0200
libcli: move some common SMB and SMB2 stuff into libcli/smb/
This will hold code that's shared between source3 and source4.
metze
---
Summary of changes:
.../libcli/smb2 = libcli/smb}/smb2_constants.h|0
.../smb/smb_common.h | 25 +--
source3/smbd/smb2_break.c |2 +-
source3/smbd/smb2_close.c |2 +-
source3/smbd/smb2_create.c |2 +-
source3/smbd/smb2_find.c |2 +-
source3/smbd/smb2_flush.c |2 +-
source3/smbd/smb2_getinfo.c|2 +-
source3/smbd/smb2_glue.c |2 +-
source3/smbd/smb2_ioctl.c |2 +-
source3/smbd/smb2_keepalive.c |2 +-
source3/smbd/smb2_lock.c |2 +-
source3/smbd/smb2_negprot.c|2 +-
source3/smbd/smb2_notify.c |2 +-
source3/smbd/smb2_read.c |2 +-
source3/smbd/smb2_server.c |2 +-
source3/smbd/smb2_sesssetup.c |2 +-
source3/smbd/smb2_setinfo.c|2 +-
source3/smbd/smb2_signing.c|2 +-
source3/smbd/smb2_tcon.c |2 +-
source3/smbd/smb2_write.c |2 +-
source4/libcli/raw/interfaces.h|2 +-
source4/libcli/smb2/smb2.h |1 -
23 files changed, 32 insertions(+), 34 deletions(-)
rename {source4/libcli/smb2 = libcli/smb}/smb2_constants.h (100%)
copy source4/libnet/libnet_export_keytab.h = libcli/smb/smb_common.h (77%)
Changeset truncated at 500 lines:
diff --git a/source4/libcli/smb2/smb2_constants.h b/libcli/smb/smb2_constants.h
similarity index 100%
rename from source4/libcli/smb2/smb2_constants.h
rename to libcli/smb/smb2_constants.h
diff --git a/source4/libnet/libnet_export_keytab.h b/libcli/smb/smb_common.h
similarity index 77%
copy from source4/libnet/libnet_export_keytab.h
copy to libcli/smb/smb_common.h
index 194f890..f5994d4 100644
--- a/source4/libnet/libnet_export_keytab.h
+++ b/libcli/smb/smb_common.h
@@ -1,28 +1,27 @@
-/*
+/*
Unix SMB/CIFS implementation.
- Copyright (C) Andrew Bartlett abart...@samba.org 2009
-
+ SMB and SMB2 common header
+
+ Copyright (C) Stefan Metzmacher 2009
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
*/
-struct libnet_export_keytab {
- struct {
- const char *keytab_name;
- } in;
- struct {
- const char *error_string;
- } out;
-};
+#ifndef __LIBCLI_SMB_SMB_COMMON_H__
+#define __LIBCLI_SMB_SMB_COMMON_H__
+
+#include ../libcli/smb/smb2_constants.h
+#endif
diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c
index 29c55fc..449b8f6 100644
--- a/source3/smbd/smb2_break.c
+++ b/source3/smbd/smb2_break.c
@@ -20,7 +20,7 @@
#include includes.h
#include smbd/globals.h
-#include ../source4/libcli/smb2/smb2_constants.h
+#include ../libcli/smb/smb_common.h
static struct tevent_req *smbd_smb2_oplock_break_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c
index acb5da7..b28fb72 100644
--- a/source3/smbd/smb2_close.c
+++ b/source3/smbd/smb2_close.c
@@ -20,7 +20,7 @@
#include includes.h
#include smbd/globals.h
-#include ../source4/libcli/smb2/smb2_constants.h
+#include ../libcli/smb/smb_common.h
static NTSTATUS smbd_smb2_close(struct smbd_smb2_request *req,
uint16_t in_flags,
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index fe414bb..43b1fcb 100644
---
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-968-g1d75a6e
The branch, master has been updated
via 1d75a6e2245c022e2688d5fa6807d572fa18bcd6 (commit)
from 1df883aa39ce69b040f9d9e72125bf4b80c714a9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1d75a6e2245c022e2688d5fa6807d572fa18bcd6
Author: Stefan Metzmacher me...@samba.org
Date: Wed Aug 12 17:43:03 2009 +0200
libcli/smb: move smb2_create_blob code to libcli/smb/
I want to use this in source3/smbd/
metze
---
Summary of changes:
libcli/smb/config.mk| 11 +++
libcli/smb/smb2_create_blob.c | 186 +++
libcli/smb/smb2_create_blob.h | 51 +++
libcli/smb/smb_common.h |1 +
source4/libcli/config.mk|2 +-
source4/libcli/raw/interfaces.h |8 +--
source4/libcli/smb2/create.c| 157 -
source4/main.mk |1 +
8 files changed, 252 insertions(+), 165 deletions(-)
create mode 100644 libcli/smb/config.mk
create mode 100644 libcli/smb/smb2_create_blob.c
create mode 100644 libcli/smb/smb2_create_blob.h
Changeset truncated at 500 lines:
diff --git a/libcli/smb/config.mk b/libcli/smb/config.mk
new file mode 100644
index 000..57c25c3
--- /dev/null
+++ b/libcli/smb/config.mk
@@ -0,0 +1,11 @@
+# common SMB and SMB2 stuff
+[SUBSYSTEM::LIBCLI_SMB_COMMON]
+PUBLIC_DEPENDENCIES = LIBTALLOC
+
+LIBCLI_SMB_COMMON_OBJ_FILES = $(addprefix ../libcli/smb/, \
+ smb2_create_blob.o)
+
+$(eval $(call proto_header_template, \
+ ../libcli/smb/smb_common_proto.h, \
+ $(LIBCLI_SMB_COMMON_OBJ_FILES:.o=.c)))
+
diff --git a/libcli/smb/smb2_create_blob.c b/libcli/smb/smb2_create_blob.c
new file mode 100644
index 000..0dad224
--- /dev/null
+++ b/libcli/smb/smb2_create_blob.c
@@ -0,0 +1,186 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ SMB2 Create Context Blob handling
+
+ Copyright (C) Andrew Tridgell 2005
+ Copyright (C) Stefan Metzmacher 2008-2009
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include includes.h
+#include ../libcli/smb/smb_common.h
+
+static size_t smb2_create_blob_padding(uint32_t offset, size_t n)
+{
+ if ((offset (n-1)) == 0) return 0;
+ return n - (offset (n-1));
+}
+
+/*
+ parse a set of SMB2 create blobs
+*/
+NTSTATUS smb2_create_blob_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB buffer,
+ struct smb2_create_blobs *blobs)
+{
+ const uint8_t *data = buffer.data;
+ uint32_t remaining = buffer.length;
+
+ while (remaining 0) {
+ uint32_t next;
+ uint32_t name_offset, name_length;
+ uint32_t reserved, data_offset;
+ uint32_t data_length;
+ char *tag;
+ DATA_BLOB b;
+ NTSTATUS status;
+
+ if (remaining 16) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+ next= IVAL(data, 0);
+ name_offset = SVAL(data, 4);
+ name_length = SVAL(data, 6);
+ reserved= SVAL(data, 8);
+ data_offset = SVAL(data, 10);
+ data_length = IVAL(data, 12);
+
+ if ((next 0x7) != 0 ||
+ next remaining ||
+ name_offset 16 ||
+ name_offset remaining ||
+ name_length != 4 || /* windows enforces this */
+ name_offset + name_length remaining ||
+ data_offset name_offset + name_length ||
+ data_offset remaining ||
+ data_offset + (uint64_t)data_length remaining) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ tag = talloc_strndup(mem_ctx, (const char *)data + name_offset,
name_length);
+ if (tag == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ b = data_blob_const(data+data_offset, data_length);
+ status = smb2_create_blob_add(mem_ctx, blobs, tag, b);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
+ talloc_free(tag);
+
+
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-969-g1ddd10b
The branch, master has been updated via 1ddd10b56aea663b06768638d83e3bdcfea9ec89 (commit) from 1d75a6e2245c022e2688d5fa6807d572fa18bcd6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1ddd10b56aea663b06768638d83e3bdcfea9ec89 Author: Jeremy Allison j...@samba.org Date: Wed Aug 12 10:58:00 2009 -0700 Fix some warnings in the AIX ACL code. Jeremy. --- Summary of changes: source3/modules/vfs_aixacl_util.c |7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_aixacl_util.c b/source3/modules/vfs_aixacl_util.c index b2329fe..2d84f03 100644 --- a/source3/modules/vfs_aixacl_util.c +++ b/source3/modules/vfs_aixacl_util.c @@ -38,8 +38,8 @@ SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl) - DEBUG(10,(acl_entry is %d\n,acl_entry)); - DEBUG(10,(acl_last(file_acl) id %d\n,acl_last(file_acl))); + DEBUG(10,(acl_entry is %p\n,(void *)acl_entry)); + DEBUG(10,(acl_last(file_acl) id %p\n,(void *)acl_last(file_acl))); /* Check if the extended acl bit is on. * * If it isn't, do not show the * @@ -124,7 +124,7 @@ SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl) ace-a_perm |= (ace-a_perm S_IXUSR) ? SMB_ACL_EXECUTE : 0; DEBUG(10,(ace-a_perm is %d\n,ace-a_perm)); - DEBUG(10,(acl_entry = %d\n,acl_entry)); + DEBUG(10,(acl_entry = %p\n,(void *)acl_entry)); DEBUG(10,(The ace_type is %d\n,acl_entry-ace_type)); acl_entry = acl_nxt(acl_entry); @@ -210,7 +210,6 @@ struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl) struct acl_entry *acl_entry = NULL; struct ace_id *ace_id = NULL; unsigned int id_type; - unsigned int user_id; unsigned int acl_length; int i; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-970-gd6270df
The branch, master has been updated
via d6270df748dcfd8d5a02c328518c2332da8fbed5 (commit)
from 1ddd10b56aea663b06768638d83e3bdcfea9ec89 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d6270df748dcfd8d5a02c328518c2332da8fbed5
Author: Jeremy Allison j...@samba.org
Date: Wed Aug 12 13:00:54 2009 -0700
Add store create time parameter (docs to follow)
that stores the create time in the user.DosTimestamps EA.
Jeremy.
---
Summary of changes:
source3/include/proto.h | 12 -
source3/include/smb.h|2 +
source3/modules/vfs_default.c|9
source3/param/loadparm.c | 12 +
source3/script/tests/selftest.sh |1 +
source3/smbd/dosmode.c | 91 --
source3/smbd/nttrans.c |8 ++--
source3/smbd/open.c |9
source3/smbd/reply.c |2 +-
source3/smbd/trans2.c|9 ++--
10 files changed, 140 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8b3e029..963e6df 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4187,6 +4187,7 @@ bool lp_administrative_share(int );
bool lp_print_ok(int );
bool lp_map_hidden(int );
bool lp_map_archive(int );
+bool lp_store_create_time(int );
bool lp_store_dos_attributes(int );
bool lp_dmapi_support(int );
bool lp_locking(const struct share_params *p );
@@ -6266,10 +6267,17 @@ bool set_sticky_write_time_fsp(struct files_struct *fsp,
struct timespec mtime);
bool update_write_time(struct files_struct *fsp);
-struct timespec get_create_timespec(struct files_struct *fsp,
+NTSTATUS set_create_timespec_ea(connection_struct *conn,
+ struct files_struct *fsp,
+ const struct smb_filename *smb_fname,
+ struct timespec create_time);
+
+struct timespec get_create_timespec(connection_struct *conn,
+ struct files_struct *fsp,
const struct smb_filename *smb_fname);
-struct timespec get_change_timespec(struct files_struct *fsp,
+struct timespec get_change_timespec(connection_struct *conn,
+ struct files_struct *fsp,
const struct smb_filename *smb_fname);
/* The following definitions come from smbd/error.c */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index fb01a92..28bd60a 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1859,6 +1859,8 @@ struct ea_list {
#define SAMBA_XATTR_DOS_ATTRIB user.DOSATTRIB
/* Prefix for DosStreams in the vfs_streams_xattr module */
#define SAMBA_XATTR_DOSSTREAM_PREFIX user.DosStream.
+/* Prefix for DOS timestamps. */
+#define SAMBA_XATTR_DOSTIMESTAMPS user.DosTimestamps
#define UUID_SIZE 16
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 2ee2fd1..a793b33 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -817,6 +817,15 @@ static int vfswrap_ntimes(vfs_handle_struct *handle,
errno = ENOSYS;
result = -1;
#endif
+
+ if (!null_timespec(ft-create_time)
+ lp_store_create_time(SNUM(handle-conn))) {
+ set_create_timespec_ea(handle-conn,
+ NULL,
+ smb_fname,
+ ft-create_time);
+ }
+
out:
END_PROFILE(syscall_ntimes);
return result;
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index dbbd6e3..3598471 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -446,6 +446,7 @@ struct service {
bool bMap_system;
bool bMap_hidden;
bool bMap_archive;
+ bool bStoreCreateTime;
bool bStoreDosAttributes;
bool bDmapiSupport;
bool bLocking;
@@ -589,6 +590,7 @@ static struct service sDefault = {
False, /* bMap_system */
False, /* bMap_hidden */
True, /* bMap_archive */
+ False, /* bStoreCreateTime */
False, /* bStoreDosAttributes */
False, /* bDmapiSupport */
True, /* bLocking */
@@ -3066,6 +3068,15 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
+ .label = store create time,
+ .type = P_BOOL,
+ .p_class= P_LOCAL,
+ .ptr= sDefault.bStoreCreateTime,
+ .special= NULL,
+
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-971-g7ad5c69
The branch, master has been updated via 7ad5c69bd45d9211dc3bceb655d63d2f141f1bc6 (commit) from d6270df748dcfd8d5a02c328518c2332da8fbed5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7ad5c69bd45d9211dc3bceb655d63d2f141f1bc6 Author: Jeremy Allison j...@samba.org Date: Wed Aug 12 13:54:38 2009 -0700 Documentation for store create time. Jeremy. --- Summary of changes: docs-xml/smbdotconf/filename/storecreatetime.xml | 15 +++ 1 files changed, 15 insertions(+), 0 deletions(-) create mode 100644 docs-xml/smbdotconf/filename/storecreatetime.xml Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/filename/storecreatetime.xml b/docs-xml/smbdotconf/filename/storecreatetime.xml new file mode 100644 index 000..5957a5d --- /dev/null +++ b/docs-xml/smbdotconf/filename/storecreatetime.xml @@ -0,0 +1,15 @@ +samba:parameter name=store create time + context=S +type=boolean + xmlns:samba=http://www.samba.org/samba/DTD/samba-doc; +description + para + If this parameter is set Samba attempts to store a create timestamp on any file or directory created by Samba + in a filesystem extended attribute. The data is written as an 8 byte Windows timestamp in little-endian form + in attribute named user.DosTimestamps. This extended attribute is explicitly hidden from smbd clients requesting an + EA list. On Linux the filesystem must have been mounted with the mount option user_xattr in order for + extended attributes to work, also extended attributes must be compiled into the Linux kernel. + /para +/description +value type=defaultno/value +/samba:parameter -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-972-g6a0c294
The branch, master has been updated
via 6a0c2946be947afbb56acbf6444d4a2b48cc06f4 (commit)
from 7ad5c69bd45d9211dc3bceb655d63d2f141f1bc6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6a0c2946be947afbb56acbf6444d4a2b48cc06f4
Author: Jeremy Allison j...@samba.org
Date: Wed Aug 12 15:08:23 2009 -0700
Fix BASE-DELAYWRITE test by removing const from struct smb_filename
in smbd_do_qfilepathinfo(). update_stat_ex_mtime() modifies the
stat struct inside the smb_fname so don't make a copy of that
stat struct, use it directly - it's meant to be updated and
represent the state of the file we're returning.
Jeremy.
---
Summary of changes:
source3/smbd/dosmode.c |2 ++
source3/smbd/globals.h |2 +-
source3/smbd/trans2.c | 38 ++
3 files changed, 21 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index e9e92ad..e9345cc 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -887,6 +887,8 @@ NTSTATUS set_create_timespec_ea(connection_struct *conn,
if (ret == -1) {
map_nt_error_from_unix(errno);
}
+ DEBUG(10,(set_create_timespec_ea: wrote create time EA for file %s\n,
+ smb_fname_str_dbg(smb_fname)));
return NT_STATUS_OK;
}
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 58c92de..0b8ef58 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -184,7 +184,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
TALLOC_CTX *mem_ctx,
uint16_t info_level,
files_struct *fsp,
- const struct smb_filename *smb_fname,
+ struct smb_filename *smb_fname,
bool delete_pending,
struct timespec write_time_ts,
bool ms_dfs_link,
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b14d505..ae4b8b0 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3987,7 +3987,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
TALLOC_CTX *mem_ctx,
uint16_t info_level,
files_struct *fsp,
- const struct smb_filename *smb_fname,
+ struct smb_filename *smb_fname,
bool delete_pending,
struct timespec write_time_ts,
bool ms_dfs_link,
@@ -4004,7 +4004,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
unsigned int data_size;
struct timespec create_time_ts, mtime_ts, atime_ts, ctime_ts;
time_t create_time, mtime, atime, c_time;
- SMB_STRUCT_STAT sbuf;
+ SMB_STRUCT_STAT *psbuf = smb_fname-st;
char *p;
char *base_name;
char *dos_fname;
@@ -4017,8 +4017,6 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
uint64_t file_index = 0;
uint32_t access_mask = 0;
- sbuf = smb_fname-st;
-
if (INFO_LEVEL_IS_UNIX(info_level) !lp_unix_extensions()) {
return NT_STATUS_INVALID_LEVEL;
}
@@ -4035,7 +4033,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
if (!mode)
mode = FILE_ATTRIBUTE_NORMAL;
- nlink = sbuf.st_ex_nlink;
+ nlink = psbuf-st_ex_nlink;
if (nlink (modeaDIR)) {
nlink = 1;
@@ -4055,12 +4053,12 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
dend = dstart + data_size - 1;
if (!null_timespec(write_time_ts) !INFO_LEVEL_IS_UNIX(info_level)) {
- update_stat_ex_mtime(sbuf, write_time_ts);
+ update_stat_ex_mtime(psbuf, write_time_ts);
}
create_time_ts = get_create_timespec(conn, fsp, smb_fname);
- mtime_ts = sbuf.st_ex_mtime;
- atime_ts = sbuf.st_ex_atime;
+ mtime_ts = psbuf-st_ex_mtime;
+ atime_ts = psbuf-st_ex_atime;
ctime_ts = get_change_timespec(conn, fsp, smb_fname);
if (lp_dos_filetime_resolution(SNUM(conn))) {
@@ -4106,20 +4104,20 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
string_replace(dos_fname, '/', '\\');
}
- allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn, fsp, sbuf);
+ allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn, fsp, psbuf);
if (!fsp) {
/* Do we have this path open ? */
files_struct *fsp1;
- struct file_id fileid = vfs_file_id_from_sbuf(conn, sbuf);
+ struct
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-973-gd91edea
The branch, master has been updated
via d91edeaa94c54a190a0c90bbd63156fdf670c26a (commit)
from 6a0c2946be947afbb56acbf6444d4a2b48cc06f4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d91edeaa94c54a190a0c90bbd63156fdf670c26a
Author: Jeremy Allison j...@samba.org
Date: Wed Aug 12 16:27:17 2009 -0700
When mapping EA's into a TDB, don't remove the EA
until the last link to the file is gone (fixes the
build farm RAW-RENAME test with xattr's in tdb's).
Jeremy.
---
Summary of changes:
source3/modules/vfs_xattr_tdb.c |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index a058c82..55fb141 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -620,6 +620,7 @@ static int xattr_tdb_unlink(vfs_handle_struct *handle,
struct db_record *rec;
NTSTATUS status;
int ret = -1;
+ bool remove_record = false;
SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
@@ -632,6 +633,10 @@ static int xattr_tdb_unlink(vfs_handle_struct *handle,
if (SMB_VFS_STAT(handle-conn, smb_fname_tmp) == -1) {
goto out;
}
+ if (smb_fname_tmp-st.st_ex_nlink == 1) {
+ /* Only remove record on last link to file. */
+ remove_record = true;
+ }
ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname_tmp);
@@ -639,6 +644,10 @@ static int xattr_tdb_unlink(vfs_handle_struct *handle,
goto out;
}
+ if (!remove_record) {
+ goto out;
+ }
+
id = SMB_VFS_FILE_ID_CREATE(handle-conn, smb_fname_tmp-st);
rec = xattr_tdb_lock_attrs(talloc_tos(), db, id);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-975-g88fd98b
The branch, master has been updated
via 88fd98b7c4ed41ab6c6ac5a226581e862ae900f3 (commit)
via 28f7b0743679c042bc135c7ec5265d75e900aa87 (commit)
from d91edeaa94c54a190a0c90bbd63156fdf670c26a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 88fd98b7c4ed41ab6c6ac5a226581e862ae900f3
Author: Jeremy Allison j...@samba.org
Date: Wed Aug 12 17:44:48 2009 -0700
Fix EVERY SINGLE build on the buildfarm that doesn't have
bindtextdomain or textdomain. C'mon, this is what configure.in
is *FOR*.
Jeremy.
commit 28f7b0743679c042bc135c7ec5265d75e900aa87
Author: Jeremy Allison j...@samba.org
Date: Wed Aug 12 17:07:13 2009 -0700
Move build over to storing DOS attributes in EA's.
Turn off map to directives. I've now fixed the
issues with the build tests running this way. I think
this is how most people run these days - please raise this on
the list (or revert) if you disagree.
---
Summary of changes:
source3/configure.in |1 +
source3/script/tests/selftest.sh |6 --
source3/utils/net.c |4
3 files changed, 9 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index 7cfd3fb..749bfc4 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1018,6 +1018,7 @@ AC_CHECK_HEADERS(sys/mman.h)
# setbuffer, shmget, shm_open are needed for smbtorture
AC_CHECK_FUNCS(shmget shm_open)
AC_CHECK_FUNCS(gettext dgettext)
+AC_CHECK_FUNCS(bindtextdomain textdomain)
# Find a method of generating a stack trace
AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 3fcfa4d..ae856ca 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -240,8 +240,10 @@ cat $SERVERCONFFILEEOF
read only = no
smbd:sharedelay = 10
smbd:writetimeupdatedelay = 50
- map hidden = yes
- map system = yes
+ map hidden = no
+ map system = no
+ map readonly = no
+ store dos attributes = yes
create mask = 755
store create time = yes
vfs objects = $BINDIR/xattr_tdb.so $BINDIR/streams_depot.so
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 1e3923f..58c9623 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -678,8 +678,12 @@ static struct functable net_func[] = {
load_case_tables();
setlocale(LC_ALL, );
+#if defined(HAVE_BINDTEXTDOMAIN)
bindtextdomain(MODULE_NAME, dyn_LOCALEDIR);
+#endif
+#if defined(HAVE_TEXTDOMAIN)
textdomain(MODULE_NAME);
+#endif
/* set default debug level to 0 regardless of what smb.conf sets */
DEBUGLEVEL_CLASS[DBGC_ALL] = 0;
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.87-46-g5852a52
The branch, master has been updated
via 5852a526ce7d0333cd1f9a05353d8920ea99db37 (commit)
via 7e799b7523c9699bd65a8a8207f7e03d668b0b81 (commit)
from a42dbdb7b9ccf3ce2aed48aa33f1cd3af2e94fe3 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 5852a526ce7d0333cd1f9a05353d8920ea99db37
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Thu Aug 13 13:02:00 2009 +1000
document enable/disablescript
commit 7e799b7523c9699bd65a8a8207f7e03d668b0b81
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Thu Aug 13 13:04:08 2009 +1000
add new controls to make it possible to enable/disable individual
eventscripts
update scriptstatus output so it lists disabled scripts
---
Summary of changes:
client/ctdb_client.c | 66 +
doc/ctdb.1 | 15 ++-
doc/ctdb.1.html| 109 ---
doc/ctdb.1.xml | 19 +++
include/ctdb.h |4 +
include/ctdb_private.h |8 +
server/ctdb_control.c |9 +
server/eventscript.c | 382 ++--
tools/ctdb.c | 49 ++-
9 files changed, 531 insertions(+), 130 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 2e7a093..a6135c9 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -3568,6 +3568,27 @@ int ctdb_ctrl_event_script_stop(struct ctdb_context
*ctdb, int32_t result)
return 0;
}
+/*
+ tell the main daemon a script was disabled
+ */
+int ctdb_ctrl_event_script_disabled(struct ctdb_context *ctdb, const char
*name)
+{
+ int ret;
+ int32_t res;
+ TDB_DATA data;
+
+ data.dptr = discard_const(name);
+ data.dsize = strlen(name)+1;
+
+ ret = ctdb_control(ctdb, CTDB_CURRENT_NODE, 0,
CTDB_CONTROL_EVENT_SCRIPT_DISABLED, 0, data,
+ ctdb, NULL, res, NULL, NULL);
+ if (ret != 0 || res != 0) {
+ DEBUG(DEBUG_ERR,(Failed to send event_script_disabeld\n));
+ return -1;
+ }
+
+ return 0;
+}
/*
get the status of running the monitor eventscripts
@@ -3776,3 +3797,48 @@ int ctdb_ctrl_setrecmasterrole(struct ctdb_context
*ctdb, struct timeval timeout
return 0;
}
+
+/* enable an eventscript
+ */
+int ctdb_ctrl_enablescript(struct ctdb_context *ctdb, struct timeval timeout,
uint32_t destnode, const char *script)
+{
+ int ret;
+ TDB_DATA data;
+ int32_t res;
+
+ data.dsize = strlen(script) + 1;
+ data.dptr = discard_const(script);
+
+ ret = ctdb_control(ctdb, destnode, 0,
+ CTDB_CONTROL_ENABLE_SCRIPT, 0, data,
+ NULL, NULL, res, timeout, NULL);
+ if (ret != 0 || res != 0) {
+ DEBUG(DEBUG_ERR,(__location__ ctdb_control for enablescript
failed\n));
+ return -1;
+ }
+
+ return 0;
+}
+
+/* disable an eventscript
+ */
+int ctdb_ctrl_disablescript(struct ctdb_context *ctdb, struct timeval timeout,
uint32_t destnode, const char *script)
+{
+ int ret;
+ TDB_DATA data;
+ int32_t res;
+
+ data.dsize = strlen(script) + 1;
+ data.dptr = discard_const(script);
+
+ ret = ctdb_control(ctdb, destnode, 0,
+ CTDB_CONTROL_DISABLE_SCRIPT, 0, data,
+ NULL, NULL, res, timeout, NULL);
+ if (ret != 0 || res != 0) {
+ DEBUG(DEBUG_ERR,(__location__ ctdb_control for disablescript
failed\n));
+ return -1;
+ }
+
+ return 0;
+}
+
diff --git a/doc/ctdb.1 b/doc/ctdb.1
index ab487d9..0b59cf6 100644
--- a/doc/ctdb.1
+++ b/doc/ctdb.1
@@ -1,11 +1,11 @@
.\ Title: ctdb
.\Author:
.\ Generator: DocBook XSL Stylesheets v1.73.2 http://docbook.sf.net/
-.\ Date: 07/28/2009
+.\ Date: 08/13/2009
.\Manual:
.\Source:
.\
-.TH CTDB 1 07/28/2009
+.TH CTDB 1 08/13/2009
.\ disable hyphenation
.nh
.\ disable justification (adjust text to left margin only)
@@ -260,6 +260,7 @@ Example output:
10\.interface Status:OKDuration:0\.077 Tue Mar 24 18:56:57 2009
11\.natgw Status:OKDuration:0\.039 Tue Mar 24 18:56:57 2009
20\.multipathdStatus:OKDuration:0\.038 Tue Mar 24 18:56:57 2009
+31\.clamd Status:DISABLED
40\.vsftpdStatus:OKDuration:0\.045 Tue Mar 24 18:56:57 2009
41\.httpd Status:OKDuration:0\.039 Tue Mar 24 18:56:57 2009
50\.samba Status:ERRORDuration:0\.082 Tue Mar 24 18:56:57 2009
@@ -267,6 +268,16 @@ Example output:
.fi
.RE
+.SS disablescript script
+.PP
+This command is used to disable an eventscript\.
+.PP
+This will take effect the next time the eventscripts are being executed so it
can
