[SCM] Samba Shared Repository - annotated tag talloc-2.0.6 created
The annotated tag, talloc-2.0.6 has been created at 00190bc1d5284c5739c7e02cfc23f0f44398f674 (tag) tagging b9083b632f09bbc245b841fe63bc68bbf0ea4d6e (commit) replaces tevent-0.9.13 tagged by Andrew Tridgell on Tue Aug 9 10:19:20 2011 +1000 - Log - talloc: tag release talloc-2.0.6 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iQEVAwUATkB9CEeTkWETCEAlAQKCGAgAscX9mcVmrqkWn9CYQWcN4X3kkAtZg0Oi gWM5GpyXs7TPuII7wwjNJMgn9dwWEWqd1rAQThql8W/3xguLyy6S4tCaF4rn0TPC 5LcqLLcjVoWsZJbCO7oKjKlPUTMouXNWduTXgi4Zq5iqAEcgnWUEfFOIeqPAt9A9 VNsxLsvQaF878w2ri1JY8eDE6UhsKCybTTbBWEDtuRLAYhsl6wOqUusIf3kjq0+W TI2MEQ7KJR5BxQYbZLwkVeXffhrO2dZp8fpt5J5S6INRxheMPfuuU7y6hl6cyTxP 4jh0r0IJ05ZSPqOq4X0Roe6JVqefz+18T2YOkZzhFZwmvljopiRLOQ== =NMvT -END PGP SIGNATURE- Alban Browaeys (1): Fix bug #8341 - libsmbclient segfault when feed the root of a mounted share via an uri Amitay Isaacs (41): samba-tool: Reimplement GPO functions in python ldb: Expose ldb_handler_fold() funcion ldb-samba: Allow --show-binary flag on defaultSecurityDescriptor s4auth: Remove duplicate assignment of structure variable s4auth: Fix the object names for PyCredentials and PyCredentialCacheContainer s4auth: Fix the object name for Py_Security samba-tool: Added python version of samba-tool samba-tool: Replace C version of samba-tool with python version samba-tool: Display Usage line and list commands alphabetically samba-tool: Raise exception on errors and report using base class samba-tool: Display usage for main commands and list them alphabetically samba-tool: Catch exceptions at top-level and exit with correct return value s4-param: Fix object names for python objects PyLoadparm and PyLoadparmContext samba-tool: For samba-tool-c, help lists commands implemented only in C s4-libcli: Added python interface for file I/O using SMB samba-tool: Python routine to find writable/ldap-capable DC s4-libnet: py_net - Remove parsing for credentials argument s4-libnet: py_net Add change_password() python command samba-tool: Add user password command to change user's own password test-blackbox: Rearrange the arguments in required order for samba-tool time test-blackbox: Remove 'domain\' from username for samba-tool user setpassword test-blackbox: Rearrange arguments for samba-tool user setpassword command test-blackbox: use python version of change password command tests-blackbox: Revert the test to use user-level change password command s4-libcli: Initialize stack structure variables to zero. samba-tool: Change samba-tool gpo semantics (use gpo name instead of dn) samba-tool: Added gpo fetch command implementation using python smb module. s4-libcli: Added python SMB methods for mkdir(), rmdir(), chkpath() s4-policy: Expose gp_ads_to_dir_access_mask() function s4-policy: Add python wrapper for ads_to_dir_access_mask() function samba-tool: Addd functions to print GPO flags and GPlink options samba-tool: Rename copy_directory_recurse to copy_directory_remote_to_local s4-policy: Use the correct local directory for stat. s4-libcli: Replace smb_composite_connect() with smb_full_connection() s4-libcli: Check if short_name is not null, before converting to python string s4-libcli: get_acl and set_acl require raw_open to set security descriptor samba-tool: Add functions to create directories and copy files over SMB share samba-tool: Add implementation of gpo create command samba-tool: Remove C version of samba-tool samba-tool: Rename samba-tool command gpo2 -- gpo s4-libcli: Fix the fd leak. Close open file descriptor before return. Andreas Schneider (78): s3-waf: Don't link LIBNTLMSSP twice. s3-auth: Fix account check over ncalrpc. s3-epmapper: Fix adding tcpip endpoints. s3-smbd: Create ev_ctx and msg_ctx and use it. s3-smbd: Pass ev_ctx to smbd_parent_loop(). s3-smbd: Pass ev_ctx and msg_ctx to open_sockets_smbd(). s3-smbd: Pass ev_ctx and msg_ctx to smbd_accept_connection(). s3-smbd: Pass ev_ctx to smbd_setup_sig_chld_handler(). s3-smbd: Pass msg_ctx to smbd_accept_connection. s3-smbd: Pass ev_ctx to remove_child_pid(). s3-smbd: Pass event and messaging context to smbd_parent_housekeeping(). s3-librpc: Pass messaging context to dcerpc register functions. s3-rpc_server: Pass event and messaging context to accept function. s3-rpc_server: Fixed segfaults in rpc daemons. s3-rpc_server: Add my copyright. s3-rpc_server: Fix messaging context in the pipes struct. s3-rpc_server: Free the np dir. s3-rpc_server: Duplicate the pipe name. s3-rpc_server: We need to copy the session_info for external pipes.
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 020032e s3:lib/events: Fix a bug in run_poll_events().
from abd2e25 talloc: prepare for 2.0.6 release
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 020032e114c0e966acf24f24e707942219d60cf3
Author: Stefan Metzmacher me...@samba.org
Date: Mon Aug 8 18:49:06 2011 +0200
s3:lib/events: Fix a bug in run_poll_events().
Ignore fd events without EVENT_FD_READ or EVENT_FD_WRITE also in
run_events_poll(). They are ignore when building the array
for the syscall in event_add_to_poll_args(), so we need to
ignore them run_events_poll() too.
metze
Signed-off-by: Andreas Schneider a...@samba.org
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Aug 9 10:11:54 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/lib/events.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/events.c b/source3/lib/events.c
index b0d3ce5..77589f8 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -243,6 +243,10 @@ bool run_events_poll(struct tevent_context *ev, int
pollrtn,
struct pollfd *pfd;
uint16 flags = 0;
+ if ((fde-flags (EVENT_FD_READ|EVENT_FD_WRITE)) == 0) {
+ continue;
+ }
+
if (pollfd_idx[fde-fd] = num_pfds) {
DEBUG(1, (internal error: pollfd_idx[fde-fd] (%d)
= num_pfds (%d)\n, pollfd_idx[fde-fd],
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 68d79eb s3-rpc_server: Fix sending of packets over named pipe proxy.
via dd3a927 s3-smbd: Pass tevent context to
smbd_server_connection_loop_once().
via bc3fae7 s3-rpc_server: Free the children of p-mem_ctx.
from 020032e s3:lib/events: Fix a bug in run_poll_events().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 68d79eb6efb32eb3bc416ffc3430f0e4b1eed691
Author: Andreas Schneider a...@samba.org
Date: Wed Aug 3 23:44:21 2011 +0200
s3-rpc_server: Fix sending of packets over named pipe proxy.
We need for named pipes we need to send each fragment on its own to be a
message.
Signed-off-by: Simo Sorce i...@samba.org
Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Tue Aug 9 11:55:18 CEST 2011 on sn-devel-104
commit dd3a92795908e8e9e5456f985e17313b2a59a8cc
Author: Andreas Schneider a...@samba.org
Date: Mon Aug 8 18:39:56 2011 +0200
s3-smbd: Pass tevent context to smbd_server_connection_loop_once().
Signed-off-by: Simo Sorce i...@samba.org
commit bc3fae70a27ced752844513996f29d0116a20079
Author: Andreas Schneider a...@samba.org
Date: Tue Jul 26 12:07:20 2011 +0200
s3-rpc_server: Free the children of p-mem_ctx.
Free the children of p-mem_ctx after processing a complete incoming and
outgoing request.
Signed-off-by: Simo Sorce i...@samba.org
---
Summary of changes:
source3/rpc_server/rpc_server.c | 55 ++
source3/smbd/process.c | 24
source3/smbd/proto.h|3 +-
source3/smbd/server.c |6 ++--
4 files changed, 49 insertions(+), 39 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index b03715c..9134b95 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -320,7 +320,7 @@ static void named_pipe_accept_function(struct
tevent_context *ev_ctx,
struct tevent_req *subreq;
int ret;
- npc = talloc_zero(NULL, struct named_pipe_client);
+ npc = talloc_zero(ev_ctx, struct named_pipe_client);
if (!npc) {
DEBUG(0, (Out of memory!\n));
close(fd);
@@ -446,6 +446,7 @@ static void named_pipe_packet_process(struct tevent_req
*subreq)
ssize_t data_used;
char *data;
uint32_t to_send;
+ size_t i;
bool ok;
status = dcerpc_read_ncacn_packet_recv(subreq, npc, pkt, recv_buffer);
@@ -479,13 +480,6 @@ static void named_pipe_packet_process(struct tevent_req
*subreq)
to_send = out-frag.length - out-current_pdu_sent;
if (to_send 0) {
- DEBUG(10, (Current_pdu_len = %u,
- current_pdu_sent = %u
- Returning %u bytes\n,
- (unsigned int)out-frag.length,
- (unsigned int)out-current_pdu_sent,
- (unsigned int)to_send));
-
npc-iov = talloc_zero(npc, struct iovec);
if (!npc-iov) {
status = NT_STATUS_NO_MEMORY;
@@ -522,11 +516,6 @@ static void named_pipe_packet_process(struct tevent_req
*subreq)
npc-iov[npc-count].iov_base = out-frag.data;
npc-iov[npc-count].iov_len = out-frag.length;
- DEBUG(10, (PDU number: %d, PDU Length: %u\n,
- (unsigned int)npc-count,
- (unsigned int)npc-iov[npc-count].iov_len));
- dump_data(11, (const uint8_t *)npc-iov[npc-count].iov_base,
- npc-iov[npc-count].iov_len);
npc-count++;
}
@@ -544,19 +533,31 @@ static void named_pipe_packet_process(struct tevent_req
*subreq)
return;
}
- DEBUG(10, (Sending a total of %u bytes\n,
+ DEBUG(10, (Sending %u fragments in a total of %u bytes\n,
+ (unsigned int)npc-count,
(unsigned int)npc-p-out_data.data_sent_length));
- subreq = tstream_writev_queue_send(npc, npc-ev,
- npc-tstream,
- npc-write_queue,
- npc-iov, npc-count);
- if (!subreq) {
- DEBUG(2, (Failed to send packet\n));
- status = NT_STATUS_NO_MEMORY;
- goto fail;
+ for (i = 0; i npc-count; i++) {
+ DEBUG(10, (Sending PDU number: %d, PDU Length: %u\n,
+ (unsigned int)i,
+ (unsigned int)npc-iov[i].iov_len));
+ dump_data(11, (const uint8_t *)npc-iov[i].iov_base,
+
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-08-09-1209/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-09-1209/samba3.stderr http://git.samba.org/autobuild.flakey/2011-08-09-1209/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-09-1209/samba4.stderr http://git.samba.org/autobuild.flakey/2011-08-09-1209/samba4.stdout The top commit at the time of the failure was: commit 68d79eb6efb32eb3bc416ffc3430f0e4b1eed691 Author: Andreas Schneider a...@samba.org Date: Wed Aug 3 23:44:21 2011 +0200 s3-rpc_server: Fix sending of packets over named pipe proxy. We need for named pipes we need to send each fragment on its own to be a message. Signed-off-by: Simo Sorce i...@samba.org Autobuild-User: Andreas Schneider a...@cryptomilk.org Autobuild-Date: Tue Aug 9 11:55:18 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e2733d3 s4-dsdb clarify that failure to load the schema items from DRS is expected via b206a36 move schema_fill_constructed() call to dsdb_setup_sorted_accessors() via dee678a s4-dsdb Remove unused schema function via 0e9cf38 s4-dsdb: added SAMDB_INDEXING_VERSION to @INDEXLIST via 6853b3a s4-dsdb: fixed booling conversion to check value length via cba88a2 ldb: fix the canonicalisation of booleans via 60b6b33 s4-dbcheck: enable dbcheck now that backlinks are fixed via 4ede333 s4-dsdb: add auto-normalisation of attributes via 2ba18d8 s4-dsdb: ensure rIDSetReferences is stored as an extended DN via 55b25e1 s4-dsdb: ensure we setup the dn_format field in schema attributes via 6ef36a0 s4-acl-test: use symbolic names for groupType via ff58087 s4-pysamba: fixed double conversion of int32 via fd04a38 s4-dsdb: make extended_dn_in a bit more efficient via 4e4953d s4-samdb: support relative paths in SamDB() connect via 8ce8107 s4-dsdb: use dn_format shortcut to find DN format via d994ef2 pysamdb: move normalise_int32() to common module from 68d79eb s3-rpc_server: Fix sending of packets over named pipe proxy. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e2733d362d97f0dca5b622e54d73ae0e0cc643f0 Author: Andrew Bartlett abart...@samba.org Date: Tue Aug 9 13:10:21 2011 +1000 s4-dsdb clarify that failure to load the schema items from DRS is expected This happens if we have a custom schema - we need to build up the schema until it loads, by converting more objects. Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Tue Aug 9 13:10:25 CEST 2011 on sn-devel-104 commit b206a365eade7fbd2defddbadf14ca293409ede3 Author: Andrew Bartlett abart...@samba.org Date: Tue Aug 9 12:55:57 2011 +1000 move schema_fill_constructed() call to dsdb_setup_sorted_accessors() commit dee678a7be373bbe6497e60d9283dae4ca4793ec Author: Andrew Bartlett abart...@samba.org Date: Tue Aug 9 11:54:17 2011 +1000 s4-dsdb Remove unused schema function commit 0e9cf380eaae413b904503bc9676f965ef71ef16 Author: Andrew Tridgell tri...@samba.org Date: Tue Aug 9 16:54:36 2011 +1000 s4-dsdb: added SAMDB_INDEXING_VERSION to @INDEXLIST this can be used to force re-indexing of samdb when we change something that affects index comparison, in this case the canonicalisation of booleans Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit 6853b3a805938ca6fdc69a35d9fdcefb1338101f Author: Andrew Tridgell tri...@samba.org Date: Tue Aug 9 16:50:51 2011 +1000 s4-dsdb: fixed booling conversion to check value length this ensures we don't look past the end of the data Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit cba88a2b623e47cf97885bd45387049da1105930 Author: Andrew Tridgell tri...@samba.org Date: Tue Aug 9 16:41:16 2011 +1000 ldb: fix the canonicalisation of booleans we were canonicalising FALSE to FALS Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit 60b6b338f7921bc3c5895e0d0fdbe79305f1be0c Author: Andrew Tridgell tri...@samba.org Date: Fri Aug 5 11:19:30 2011 +1000 s4-dbcheck: enable dbcheck now that backlinks are fixed commit 4ede333f468b36fb7435c9de1216da3b66bf0490 Author: Andrew Tridgell tri...@samba.org Date: Tue Aug 9 14:41:20 2011 +1000 s4-dsdb: add auto-normalisation of attributes this auto-normalises some attributes when they are added/modified. The list that we auto-normalise is currently: Boolean INT32 INTEGER UTC_TIME This fixes a problem with groupType being stored in an unnormalised form Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit 2ba18d89eb066cf52d8bbd18a28e494bb4247d9c Author: Andrew Tridgell tri...@samba.org Date: Tue Aug 9 13:18:08 2011 +1000 s4-dsdb: ensure rIDSetReferences is stored as an extended DN Signed-off-by: Andrew Bartlett abart...@samba.org commit 55b25e1e23882fb8eb476408790b12f03a5d65e8 Author: Andrew Tridgell tri...@samba.org Date: Tue Aug 9 11:47:25 2011 +1000 s4-dsdb: ensure we setup the dn_format field in schema attributes this ensures we setup dn_format when we do runtime schema changes Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit 6ef36a0e6ad3363445e1250495873738e83b108a Author: Andrew Tridgell tri...@samba.org Date: Fri Aug 5 14:03:58 2011 +1000 s4-acl-test: use symbolic names for groupType clearer than magic numbers commit ff58087a3f686bfcfa304c28179fb2b03c4a0a46 Author: Andrew Tridgell tri...@samba.org Date: Fri Aug 5 14:02:39 2011 +1000 s4-pysamba: fixed double conversion of int32
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 7602225 WHATSNEW: Update changes since rc3. via d1ab64c s3:modules:nfs4_acls: improve fix for bug #8330 via 3c05013 s3:modules fix Bug 8330 NFSv4 ACL merging logic is broken via 6a587c9 s3:lib/events: Fix a bug in run_poll_events(). via cbd408d s3:smb2_server: make sure we grant credits on async read/write operations (bug #8357) via 87fa72a s3/swat: use strlcat instead of strncat to fix build on old Linux distros via be41d88 s3:web/swat: use strtoll() instead of atoi/atol/atoll from d6f841b WHATSNEW: Update release notes. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 76022256cd23cd71354e21384e2350c761e9f373 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 9 13:15:02 2011 +0200 WHATSNEW: Update changes since rc3. Karolin commit d1ab64cbc2d62744f541eea0d80d7b522416ac1c Author: Michael Adam ob...@samba.org Date: Thu Jul 28 09:49:34 2011 +0200 s3:modules:nfs4_acls: improve fix for bug #8330 simplify the check insmbacl4_find_equal_special() Signed-off-by: Michael Adam ob...@samba.org commit 3c05013694c453411b78a1df884a80c8d48e7393 Author: Christian Ambach a...@samba.org Date: Wed Jul 27 14:46:00 2011 +0200 s3:modules fix Bug 8330 NFSv4 ACL merging logic is broken we should not merge ACEs with different flags (e.g. CI/OI/I/) Otherwise ACLs get wrong entries and thus wrong semantics Example: ACL:BUILTIN\Users:ALLOWED/0x0/FULL ACL:BUILTIN\Users:ALLOWED/I/READ got merged to ACL:BUILTIN\Users:ALLOWED/I/FULL This is not the same and also leads to wrong displays in the Windows ACL dialog Autobuild-User: Christian Ambach a...@samba.org Autobuild-Date: Wed Jul 27 16:03:51 CEST 2011 on sn-devel-104 commit 6a587c926b7fdcb934b916a29bdd04bd0ef606b9 Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 8 18:49:06 2011 +0200 s3:lib/events: Fix a bug in run_poll_events(). Ignore fd events without EVENT_FD_READ or EVENT_FD_WRITE also in run_events_poll(). They are ignore when building the array for the syscall in event_add_to_poll_args(), so we need to ignore them run_events_poll() too. metze Signed-off-by: Andreas Schneider a...@samba.org Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Tue Aug 9 10:11:54 CEST 2011 on sn-devel-104 (cherry picked from commit 020032e114c0e966acf24f24e707942219d60cf3) Fix bug #8358 (smbd exits with NT_STATUS_INTERNAL_ERROR in run_poll_events()). commit cbd408df89ec51fb06fbfb935458eb8425639bed Author: Stefan Metzmacher me...@samba.org Date: Sat Aug 6 10:19:21 2011 +0200 s3:smb2_server: make sure we grant credits on async read/write operations (bug #8357) Currently we skip, the gone async interim response on read and write, this caused the aio code path to grant 0 credits to the client in the read/write responses. metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Sun Aug 7 22:23:57 CEST 2011 on sn-devel-104 (cherry picked from commit 47bffb9b9243dc72d7305cd9ec3e63e176841bf5) commit 87fa72a5202fe3780d4a61289bf755027cd078f4 Author: Björn Jacke b...@sernet.de Date: Thu Aug 4 16:25:08 2011 +0200 s3/swat: use strlcat instead of strncat to fix build on old Linux distros SLES 9's glibc for example had weird macros where the use of strncat resulted in the use of strcat which we don't allow. Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User: Björn Jacke b...@sernet.de Autobuild-Date: Thu Aug 4 17:50:24 CEST 2011 on sn-devel-104 (cherry picked from commit d3b4d75364210e2d2a4a1cd806f28b0021f22909) Fix bug #8362 (build issue on old glibc systems). commit be41d88e55237214e5a27f7bd8d8c15e27d31579 Author: Stefan Metzmacher me...@samba.org Date: Fri Aug 5 19:48:38 2011 +0200 s3:web/swat: use strtoll() instead of atoi/atol/atoll This is more portable, as we have a strtoll replacement in lib/replace. metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Sat Aug 6 11:55:45 CEST 2011 on sn-devel-104 (cherry picked from commit a6be0820d09b3f3eabfbb5f4356add303aa8a494) Fix bug #8347 (CVE-2011-2522 regression for HP-UX, AIX and OSF). --- Summary of changes: WHATSNEW.txt| 14 ++ source3/lib/events.c|4 source3/modules/nfs4_acls.c |7 ++- source3/smbd/smb2_server.c | 21 +++-- source3/web/swat.c | 27 --- 5 files changed, 55 insertions(+), 18 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 34b8765 s3:web/swat: use strtoll() instead of atoi/atol/atoll
from 921e87a WHATSNEW: Fix typo.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 34b8765d894f13490fab734ee91bd53e235d10e6
Author: Stefan Metzmacher me...@samba.org
Date: Fri Aug 5 19:48:38 2011 +0200
s3:web/swat: use strtoll() instead of atoi/atol/atoll
This is more portable, as we have a strtoll replacement
in lib/replace.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Sat Aug 6 11:55:45 CEST 2011 on sn-devel-104
(cherry picked from commit a6be0820d09b3f3eabfbb5f4356add303aa8a494)
Fix bug #8347 (CVE-2011-2522 regression for HP-UX, AIX and OSF).
---
Summary of changes:
source3/web/swat.c | 25 +++--
1 files changed, 19 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3a88986..3a09152 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -192,16 +192,29 @@ bool verify_xsrf_token(const char *formname)
const char *pass = cgi_user_pass();
const char *token = cgi_variable_nonull(XSRF_TOKEN);
const char *time_str = cgi_variable_nonull(XSRF_TIME);
+ char *p = NULL;
+ long long xsrf_time_ll = 0;
time_t xsrf_time = 0;
time_t now = time(NULL);
- if (sizeof(time_t) == sizeof(int)) {
- xsrf_time = atoi(time_str);
- } else if (sizeof(time_t) == sizeof(long)) {
- xsrf_time = atol(time_str);
- } else if (sizeof(time_t) == sizeof(long long)) {
- xsrf_time = atoll(time_str);
+ errno = 0;
+ xsrf_time_ll = strtoll(time_str, p, 10);
+ if (errno != 0) {
+ return false;
+ }
+ if (p == NULL) {
+ return false;
+ }
+ if (PTR_DIFF(p, time_str) strlen(time_str)) {
+ return false;
+ }
+ if (xsrf_time_ll _TYPE_MAXIMUM(time_t)) {
+ return false;
+ }
+ if (xsrf_time_ll _TYPE_MINIMUM(time_t)) {
+ return false;
}
+ xsrf_time = xsrf_time_ll;
if (abs(now - xsrf_time) XSRF_TIMEOUT) {
return false;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated
via ac5d8c0 s3:web/swat: use strtoll() instead of atoi/atol/atoll
from 6165a76 WHATSNEW: Start release notes for 3.4.15.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit ac5d8c0148e10a3a0af9e1dc0849bb6920c26ad7
Author: Stefan Metzmacher me...@samba.org
Date: Fri Aug 5 19:48:38 2011 +0200
s3:web/swat: use strtoll() instead of atoi/atol/atoll
This is more portable, as we have a strtoll replacement
in lib/replace.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Sat Aug 6 11:55:45 CEST 2011 on sn-devel-104
(cherry picked from commit a6be0820d09b3f3eabfbb5f4356add303aa8a494)
Fix bug #8347 (CVE-2011-2522 regression for HP-UX, AIX and OSF).
---
Summary of changes:
source3/web/swat.c | 25 +++--
1 files changed, 19 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/web/swat.c b/source3/web/swat.c
index b358956..85bc6bc 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -192,16 +192,29 @@ bool verify_xsrf_token(const char *formname)
const char *pass = cgi_user_pass();
const char *token = cgi_variable_nonull(XSRF_TOKEN);
const char *time_str = cgi_variable_nonull(XSRF_TIME);
+ char *p = NULL;
+ long long xsrf_time_ll = 0;
time_t xsrf_time = 0;
time_t now = time(NULL);
- if (sizeof(time_t) == sizeof(int)) {
- xsrf_time = atoi(time_str);
- } else if (sizeof(time_t) == sizeof(long)) {
- xsrf_time = atol(time_str);
- } else if (sizeof(time_t) == sizeof(long long)) {
- xsrf_time = atoll(time_str);
+ errno = 0;
+ xsrf_time_ll = strtoll(time_str, p, 10);
+ if (errno != 0) {
+ return false;
+ }
+ if (p == NULL) {
+ return false;
+ }
+ if (PTR_DIFF(p, time_str) strlen(time_str)) {
+ return false;
+ }
+ if (xsrf_time_ll _TYPE_MAXIMUM(time_t)) {
+ return false;
+ }
+ if (xsrf_time_ll _TYPE_MINIMUM(time_t)) {
+ return false;
}
+ xsrf_time = xsrf_time_ll;
if (abs(now - xsrf_time) XSRF_TIMEOUT) {
return false;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 552ccc6 s3/swat: use strlcat instead of strncat to fix build on old Linux distros from 34b8765 s3:web/swat: use strtoll() instead of atoi/atol/atoll http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 552ccc6588b0744ae9b3731b1406749baea03d5a Author: Björn Jacke b...@sernet.de Date: Thu Aug 4 16:25:08 2011 +0200 s3/swat: use strlcat instead of strncat to fix build on old Linux distros SLES 9's glibc for example had weird macros where the use of strncat resulted in the use of strcat which we don't allow. Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User: Björn Jacke b...@sernet.de Autobuild-Date: Thu Aug 4 17:50:24 CEST 2011 on sn-devel-104 (cherry picked from commit d3b4d75364210e2d2a4a1cd806f28b0021f22909) Fix bug #8362 (build issue on old glibc systems). (cherry picked from commit 87fa72a5202fe3780d4a61289bf755027cd078f4) --- Summary of changes: source3/web/swat.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/web/swat.c b/source3/web/swat.c index 3a09152..754e3ce 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -168,7 +168,7 @@ void get_xsrf_token(const char *username, const char *pass, char tmp[3]; snprintf(tmp, sizeof(tmp), %02x, token[i]); - strncat(token_str, tmp, sizeof(tmp)); + strlcat(token_str, tmp, sizeof(tmp)); } } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via b941edf s3/swat: use strlcat instead of strncat to fix build on old Linux distros from ac5d8c0 s3:web/swat: use strtoll() instead of atoi/atol/atoll http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit b941edf9c20bd6a92aec2a62be5b830db1194ce8 Author: Björn Jacke b...@sernet.de Date: Thu Aug 4 16:25:08 2011 +0200 s3/swat: use strlcat instead of strncat to fix build on old Linux distros SLES 9's glibc for example had weird macros where the use of strncat resulted in the use of strcat which we don't allow. Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User: Björn Jacke b...@sernet.de Autobuild-Date: Thu Aug 4 17:50:24 CEST 2011 on sn-devel-104 (cherry picked from commit d3b4d75364210e2d2a4a1cd806f28b0021f22909) Fix bug #8362 (build issue on old glibc systems). (cherry picked from commit 87fa72a5202fe3780d4a61289bf755027cd078f4) (cherry picked from commit 552ccc6588b0744ae9b3731b1406749baea03d5a) --- Summary of changes: source3/web/swat.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/web/swat.c b/source3/web/swat.c index 85bc6bc..bfa003e 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -168,7 +168,7 @@ void get_xsrf_token(const char *username, const char *pass, char tmp[3]; snprintf(tmp, sizeof(tmp), %02x, token[i]); - strncat(token_str, tmp, sizeof(tmp)); + strlcat(token_str, tmp, sizeof(tmp)); } } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated
The branch, v3-3-test has been updated
via eb4ab13 s3:web/swat: use strtoll() instead of atoi/atol/atoll
from 02621d4 WHATSNEW: Start release notes for 3.3.17.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit eb4ab1340e9926575646e107db406d1aa7ddb0f2
Author: Stefan Metzmacher me...@samba.org
Date: Fri Aug 5 19:48:38 2011 +0200
s3:web/swat: use strtoll() instead of atoi/atol/atoll
This is more portable, as we have a strtoll replacement
in lib/replace.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Sat Aug 6 11:55:45 CEST 2011 on sn-devel-104
(cherry picked from commit a6be0820d09b3f3eabfbb5f4356add303aa8a494)
Fix bug #8347 (CVE-2011-2522 regression for HP-UX, AIX and OSF).
---
Summary of changes:
source/web/swat.c | 25 +++--
1 files changed, 19 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/web/swat.c b/source/web/swat.c
index f21bcaa..bc2497f 100644
--- a/source/web/swat.c
+++ b/source/web/swat.c
@@ -191,16 +191,29 @@ bool verify_xsrf_token(const char *formname)
const char *pass = cgi_user_pass();
const char *token = cgi_variable_nonull(XSRF_TOKEN);
const char *time_str = cgi_variable_nonull(XSRF_TIME);
+ char *p = NULL;
+ long long xsrf_time_ll = 0;
time_t xsrf_time = 0;
time_t now = time(NULL);
- if (sizeof(time_t) == sizeof(int)) {
- xsrf_time = atoi(time_str);
- } else if (sizeof(time_t) == sizeof(long)) {
- xsrf_time = atol(time_str);
- } else if (sizeof(time_t) == sizeof(long long)) {
- xsrf_time = atoll(time_str);
+ errno = 0;
+ xsrf_time_ll = strtoll(time_str, p, 10);
+ if (errno != 0) {
+ return false;
+ }
+ if (p == NULL) {
+ return false;
+ }
+ if (PTR_DIFF(p, time_str) strlen(time_str)) {
+ return false;
+ }
+ if (xsrf_time_ll _TYPE_MAXIMUM(time_t)) {
+ return false;
+ }
+ if (xsrf_time_ll _TYPE_MINIMUM(time_t)) {
+ return false;
}
+ xsrf_time = xsrf_time_ll;
if (abs(now - xsrf_time) XSRF_TIMEOUT) {
return false;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated
The branch, v3-3-test has been updated via cc000a3 s3/swat: use strlcat instead of strncat to fix build on old Linux distros from eb4ab13 s3:web/swat: use strtoll() instead of atoi/atol/atoll http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit cc000a3566ec886f7c8f274b9a7fc5e6cf133fad Author: Björn Jacke b...@sernet.de Date: Thu Aug 4 16:25:08 2011 +0200 s3/swat: use strlcat instead of strncat to fix build on old Linux distros SLES 9's glibc for example had weird macros where the use of strncat resulted in the use of strcat which we don't allow. Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User: Björn Jacke b...@sernet.de Autobuild-Date: Thu Aug 4 17:50:24 CEST 2011 on sn-devel-104 Fix bug #8362 (build issue on old glibc systems). --- Summary of changes: source/web/swat.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/web/swat.c b/source/web/swat.c index bc2497f..21e33e1 100644 --- a/source/web/swat.c +++ b/source/web/swat.c @@ -167,7 +167,7 @@ void get_xsrf_token(const char *username, const char *pass, char tmp[3]; snprintf(tmp, sizeof(tmp), %02x, token[i]); - strncat(token_str, tmp, sizeof(tmp)); + strlcat(token_str, tmp, sizeof(tmp)); } } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-stable updated
The branch, v3-6-stable has been updated via b1d9ddf WHATSNEW: Update changes since rc3. via eedcb96 s3:modules:nfs4_acls: improve fix for bug #8330 via d9401ce s3:modules fix Bug 8330 NFSv4 ACL merging logic is broken via 7d63904 s3:lib/events: Fix a bug in run_poll_events(). via 648d025 s3:smb2_server: make sure we grant credits on async read/write operations (bug #8357) via d165fd1 s3/swat: use strlcat instead of strncat to fix build on old Linux distros via b7003a1 s3:web/swat: use strtoll() instead of atoi/atol/atoll via ff504e0 WHATSNEW: Update release notes. via 49ddc33 s3: Fix smb2 handling error returns from aio via 9278e09 Fix bug 7462 - Non-standard SA_RESETHAND is used in ...lib/tevent/tevent_signal.c via ef4d9b0 Fix bug #8341 - libsmbclient segfault when feed the root of a mounted share via an uri via 1a5671e s3: dbwrap_ctdb.c: Fix bug #8303 #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue via 23ca80a Second part of bugfix for bug #8335 - file copy aborts with smb2_validate_message_id: bad message_id via e513eec First part of bugfix for bug #8335 - file copy aborts with smb2_validate_message_id: bad message_id via 9471eff s3:loadparm: fix the reload of the configuration: also reload activated registry shares via d78bb0c s3:loadparm: add reload_registry_shares() - reload only those shares already loaded (cherry picked from commit ec113a58a4dc4e4f3ea03f7818eb312325f69482) (cherry picked from commit cc3c8d10940ef5d5d0e636b0f9d46606d46b0dc7) via 40fc990 nbt: fix WinXP S3 domain join: alignment of nbt_netlogon_response_from_pdc via 1b9f624 Fix bug #8324 - smbclient cannot list directories from a big-endian machine. via 07a8bb7 s3:torture: remove a file accidentially committed with 3b2fe4728d6d916508b677e696ecad88f8b7b9fd via 0b90096 s3:idmap_tdb2: remove the undocumented option of the silly name tdb:idmap2.tdb via 7b0dcd3 s3:idmap_tdb2: remove a legacy comment (cherry picked from commit 67cd2f9d867fad1f7df2d6a6a5cdb723336ac495) (cherry picked from commit 55019ced08d235a3ba9ae27b06379fcb827f9b28) via f99d96c s3:idmap_tdb2: remove legacy comment (cherry picked from commit 4b5ada3d27198b49771acb70ae979087235be783) (cherry picked from commit 4369aeb41c2fafd6a1e0baff5cbb05d223e869ab) via 966e0a8 s3:idmap_tdb2: remove superfluous initialization with bogus comment (cherry picked from commit 551185573899b6e608863f833633d40ae04458d8) (cherry picked from commit 5a5b069166d5f224526f6cae049fa14cf35c426a) via 5d051af s3:idmap_tdb2: fix a legacy comment that does not apply any more (cherry picked from commit 7d3dc2164b3929c642127659593e69fc865a6184) (cherry picked from commit 7f56b6269792300237193b69541f73fb32a986b3) via 84fbf75 s3:doc: add an example with idmap script to the idmap_tdb2 manpage (cherry picked from commit 86973eee43605a3680fb51470a81ea9ca7f1b515) (cherry picked from commit 2abe73e5eed10af4ee030449322ddbc4c7054c08) via d520dcd s3:docs: remove legacy text from the example in the idmap_tdb2 manpage (cherry picked from commit 2f253c2791ccb2421f26f563e3983ee950da1d05) (cherry picked from commit 66216f6325f33c2a1d7c3e114754efc78d61aae2) via 48794f1 s3:doc: clarify the idmap script section in the idmap_tdb2 manpage (cherry picked from commit 4daab85ae60f2821a1d9d98f1edff6a318e8e3c1) (cherry picked from commit 29e39194aaa15c44178b16a4abc5583f5ff4688f) via c3cef18 s3:docs:idmap_tdb2: update the documentation of idmap script via 7672230 s3:idmap_tdb2: deprecate the idmap:script parameter and use idmap config * : script instead from e4428a5 WHATSNEW: Start release notes for 3.6.0. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable - Log - commit b1d9ddf738c6e59e489bc9c339ce6de5988b689e Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 9 13:15:02 2011 +0200 WHATSNEW: Update changes since rc3. Karolin (cherry picked from commit 76022256cd23cd71354e21384e2350c761e9f373) commit eedcb96f8879dbaa6b585eb21a9c64fbeaaa7867 Author: Michael Adam ob...@samba.org Date: Thu Jul 28 09:49:34 2011 +0200 s3:modules:nfs4_acls: improve fix for bug #8330 simplify the check insmbacl4_find_equal_special() Signed-off-by: Michael Adam ob...@samba.org (cherry picked from commit d1ab64cbc2d62744f541eea0d80d7b522416ac1c) commit d9401ce77e07a7f9f52d2a7400ed3767f77bd74f Author: Christian Ambach a...@samba.org Date: Wed Jul 27 14:46:00 2011 +0200 s3:modules fix Bug 8330 NFSv4 ACL merging logic is broken we should not merge ACEs with different flags (e.g. CI/OI/I/) Otherwise ACLs get wrong entries and thus wrong semantics Example: ACL:BUILTIN\Users:ALLOWED/0x0/FULL ACL:BUILTIN\Users:ALLOWED/I/READ got
[SCM] Samba Shared Repository - annotated tag samba-3.6.0 created
The annotated tag, samba-3.6.0 has been created at 25b678f273d8379c2dbd8c51c8b480e416157f06 (tag) tagging b1d9ddf738c6e59e489bc9c339ce6de5988b689e (commit) replaces samba-3.6.0rc3 tagged by Karolin Seeger on Tue Aug 9 13:18:14 2011 +0200 - Log - tag samba-3.6.0 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.15 (GNU/Linux) iD8DBQBOQReHbzORW2Vot+oRAkixAJ9/cLG7B620qq/nFpleuHl1hUX7RACfTBG+ B/09renKlqFnb3ewcTBrzVw= =zWn1 -END PGP SIGNATURE- Alban Browaeys (1): Fix bug #8341 - libsmbclient segfault when feed the root of a mounted share via an uri Andrew Bartlett (1): nbt: fix WinXP S3 domain join: alignment of nbt_netlogon_response_from_pdc Björn Baumbach (1): s3: dbwrap_ctdb.c: Fix bug #8303 #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue Björn Jacke (1): s3/swat: use strlcat instead of strncat to fix build on old Linux distros Christian Ambach (1): s3:modules fix Bug 8330 NFSv4 ACL merging logic is broken Jeremy Allison (4): Fix bug #8324 - smbclient cannot list directories from a big-endian machine. First part of bugfix for bug #8335 - file copy aborts with smb2_validate_message_id: bad message_id Second part of bugfix for bug #8335 - file copy aborts with smb2_validate_message_id: bad message_id Fix bug 7462 - Non-standard SA_RESETHAND is used in ...lib/tevent/tevent_signal.c Karolin Seeger (4): VERSION: Bump version up to 3.6.0. WHATSNEW: Start release notes for 3.6.0. WHATSNEW: Update release notes. WHATSNEW: Update changes since rc3. Michael Adam (14): s3:idmap_tdb2: deprecate the idmap:script parameter and use idmap config * : script instead s3:docs:idmap_tdb2: update the documentation of idmap script s3:doc: clarify the idmap script section in the idmap_tdb2 manpage (cherry picked from commit 4daab85ae60f2821a1d9d98f1edff6a318e8e3c1) s3:docs: remove legacy text from the example in the idmap_tdb2 manpage (cherry picked from commit 2f253c2791ccb2421f26f563e3983ee950da1d05) s3:doc: add an example with idmap script to the idmap_tdb2 manpage (cherry picked from commit 86973eee43605a3680fb51470a81ea9ca7f1b515) s3:idmap_tdb2: fix a legacy comment that does not apply any more (cherry picked from commit 7d3dc2164b3929c642127659593e69fc865a6184) s3:idmap_tdb2: remove superfluous initialization with bogus comment (cherry picked from commit 551185573899b6e608863f833633d40ae04458d8) s3:idmap_tdb2: remove legacy comment (cherry picked from commit 4b5ada3d27198b49771acb70ae979087235be783) s3:idmap_tdb2: remove a legacy comment (cherry picked from commit 67cd2f9d867fad1f7df2d6a6a5cdb723336ac495) s3:idmap_tdb2: remove the undocumented option of the silly name tdb:idmap2.tdb s3:torture: remove a file accidentially committed with 3b2fe4728d6d916508b677e696ecad88f8b7b9fd s3:loadparm: add reload_registry_shares() - reload only those shares already loaded (cherry picked from commit ec113a58a4dc4e4f3ea03f7818eb312325f69482) s3:loadparm: fix the reload of the configuration: also reload activated registry shares s3:modules:nfs4_acls: improve fix for bug #8330 Stefan Metzmacher (3): s3:web/swat: use strtoll() instead of atoi/atol/atoll s3:smb2_server: make sure we grant credits on async read/write operations (bug #8357) s3:lib/events: Fix a bug in run_poll_events(). Volker Lendecke (1): s3: Fix smb2 handling error returns from aio --- -- Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-08-09-1406/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-09-1406/samba3.stderr http://git.samba.org/autobuild.flakey/2011-08-09-1406/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-09-1406/samba4.stderr http://git.samba.org/autobuild.flakey/2011-08-09-1406/samba4.stdout The top commit at the time of the failure was: commit e2733d362d97f0dca5b622e54d73ae0e0cc643f0 Author: Andrew Bartlett abart...@samba.org Date: Tue Aug 9 13:10:21 2011 +1000 s4-dsdb clarify that failure to load the schema items from DRS is expected This happens if we have a custom schema - we need to build up the schema until it loads, by converting more objects. Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Tue Aug 9 13:10:25 CEST 2011 on sn-devel-104
[SCM] Samba GTK+ frontends branch, master, updated. efe74f1e59169fce20508f830fd27fe4748bbf85
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 efe74f1e59169fce20508f830fd27fe4748bbf85 (commit) via 114c46ea8433066f4cc9fbfc6170849d059aa1c4 (commit) from 24754212686ec29c642935141c808f01a8585707 (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 efe74f1e59169fce20508f830fd27fe4748bbf85 Author: Jelmer Vernooij jel...@samba.org Date: Tue Aug 9 14:20:02 2011 +0200 Ignore build directory. commit 114c46ea8433066f4cc9fbfc6170849d059aa1c4 Author: Jelmer Vernooij jel...@samba.org Date: Tue Aug 9 14:19:52 2011 +0200 Support building and installing manual pages. --- Summary of changes: .bzrignore |1 + setup.py | 59 +-- 2 files changed, 58 insertions(+), 2 deletions(-) hooks/post-receive -- Samba GTK+ frontends
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via d506888 Announce Samba 3.6.0. from 1130be9 Fix typo. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit d50688870acf10f12b5910ca7b3178f38c6983b1 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 9 14:12:27 2011 +0200 Announce Samba 3.6.0. Karolin --- Summary of changes: devel/index.html| 38 +-- generated_news/latest_10_bodies.html| 21 +- generated_news/latest_10_headlines.html |4 +- generated_news/latest_2_bodies.html | 30 +- history/header_history.html |1 + history/samba-3.6.0.html| 701 +++ latest_stable_release.html |6 +- 7 files changed, 734 insertions(+), 67 deletions(-) create mode 100755 history/samba-3.6.0.html Changeset truncated at 500 lines: diff --git a/devel/index.html b/devel/index.html index d1aaa56..b1d78e3 100755 --- a/devel/index.html +++ b/devel/index.html @@ -20,15 +20,15 @@ All older code is in the original Subversion and CVS trees; this would include 3.0.x and 2.2.x versions of Samba, which are no longer in active development. /p -pWith the release of Samba 3.5.0, the 3.4 series has been turned into +pWith the release of Samba 3.6.0, the 3.5 series has been turned into maintenance mode, which means severe bug fixes and security fixes only./p -pThere will be security fixes only for the 3.3 series./p +pThere will be security fixes only for the 3.4 series./p -pThe 3.2 series will be discontinued./p +pThe 3.3 series will be discontinued./p pOngoing future research is being done for Samba 4.0 -This work is concurrent with Samba 3.4 maintenance +This work is concurrent with Samba 3.6 maintenance and development. An a href=/samba/ftp/samba4/alpha release/a is available./p br / @@ -55,42 +55,22 @@ Git for Samba Development/a./p pThis is the new combined branch for 3.x.x emand/em 4.x.x development./p /li li - h4emv3-2-test/em/h4 - pThis is the current branch for 3.2.x maintenance - (security fixes emonly/em)./p -/li -li - h4emv3-2-stable/em/h4 - pThis is the current branch for 3.2.x maintenance releases - (security fixes emonly/em)./p -/li -li - h4emv3-3-test/em/h4 - pThis is the current branch for 3.3.x maintenance - (security fixes emonly/em)./p -/li -li - h4emv3-3-stable/em/h4 - pThis is the current branch for 3.3.x maintenance releases - (security fixes emonly/em)./p -/li -li h4emv3-4-test/em/h4 pThis is the current branch for 3.4.x maintenance releases -(critical fixes and security fixes emonly/em./p +(security fixes emonly/em./p /li li h4emv3-4-stable/em/h4 - pThis is the current branch for 3.4.x production releases/p -(critical fixes and security fixes emonly/em./p + pThis is the current branch for 3.4.x maintenance releases/p +(security fixes emonly/em./p /li li h4emv3-5-test/em/h4 - pThis is the current branch for 3.5.x development./p + pThis is the current branch for 3.5.x maintenance releases./p /li li h4emv3-5-stable/em/h4 - pThis is the current branch for 3.5.x production releases./p + pThis is the current branch for 3.5.x maintenance releases./p /li li h4emv3-6-test/em/h4 diff --git a/generated_news/latest_10_bodies.html b/generated_news/latest_10_bodies.html index 1f62438..a7e60ec 100644 --- a/generated_news/latest_10_bodies.html +++ b/generated_news/latest_10_bodies.html @@ -1,3 +1,12 @@ + h5a name=3.6.009 August 2011/a/h5 + p class=headlineSamba 3.6.0 Available for Download/p + pThis is the latest stable release of the Samba 3.6 series./p + +pThe uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +a href=http://samba.org/samba/ftp/stable/samba-3.6.0.tar.gz;downloaded +now/a. A a href=http://samba.org/samba/ftp/patches/patch-3.5.11-3.6.0.diffs.gz;patch against Samba 3.5.11/a is also available. See a href=http://samba.org/samba/history/samba-3.6.0.html;the release notes for more info/a./p + h5a name=3.5.1104 August 2011/a/h5 p class=headlineSamba 3.5.11 Available for Download/p pThis is the latest stable release of the Samba 3.5 series./p @@ -143,15 +152,3 @@ now/a. A a href=http://samba.org/samba/ftp/patches/patch-3.5.8-3.5.9.diffs.g Precompiled packages will be made available on a volunteer basis and can be found in the a href=http://samba.org/samba/ftp/Binary_Packages/;Binary_Packages download area/a./p - - h5a name=3.4.1321 April 2011/a/h5 - p class=headlineSamba 3.4.13 Available for Download/p - -pSamba 3.4.13
[SCM] Samba GTK+ frontends branch, master, updated. 3d8d629ed073eedba5a440fd00f61698e80f1809
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 3d8d629ed073eedba5a440fd00f61698e80f1809 (commit) from efe74f1e59169fce20508f830fd27fe4748bbf85 (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 3d8d629ed073eedba5a440fd00f61698e80f1809 Author: Jelmer Vernooij jel...@samba.org Date: Tue Aug 9 14:23:40 2011 +0200 Only install desktop files for existing packages. --- Summary of changes: setup.py |5 + 1 files changed, 1 insertions(+), 4 deletions(-) hooks/post-receive -- Samba GTK+ frontends
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 46eacae script/librelease.sh: add git push for the release tag
via 857ad72 ndr_drsuapi: fix compiler warning
from e2733d3 s4-dsdb clarify that failure to load the schema items from
DRS is expected
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 46eacae8b516c0a2b9c372af0baadc436f64d957
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 9 13:51:08 2011 +0200
script/librelease.sh: add git push for the release tag
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Aug 9 15:19:07 CEST 2011 on sn-devel-104
commit 857ad72cac5291ff860b49f0b4a77b7f0ebb32be
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 9 12:40:55 2011 +0200
ndr_drsuapi: fix compiler warning
metze
---
Summary of changes:
librpc/ndr/ndr_drsuapi.c |5 +++--
script/librelease.sh |7 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_drsuapi.c b/librpc/ndr/ndr_drsuapi.c
index 852153a..f7125e6 100644
--- a/librpc/ndr/ndr_drsuapi.c
+++ b/librpc/ndr/ndr_drsuapi.c
@@ -101,7 +101,7 @@ static void _print_drsuapi_DsAttributeValue_attid(struct
ndr_print *ndr, const c
static void _print_drsuapi_DsAttributeValue_str(struct ndr_print *ndr, const
char *name,
const struct
drsuapi_DsAttributeValue *r)
{
- char *str;
+ void *p;
size_t converted_size = 0;
ndr_print_struct(ndr, name, drsuapi_DsAttributeValue);
@@ -110,9 +110,10 @@ static void _print_drsuapi_DsAttributeValue_str(struct
ndr_print *ndr, const cha
CH_UTF16, CH_UNIX,
r-blob-data,
r-blob-length,
- (void **)str, converted_size)) {
+ p, converted_size)) {
ndr_print_string(ndr, string, INVALID CONVERSION);
} else {
+ char *str = (char *)p;
ndr_print_string(ndr, string, str);
talloc_free(str);
}
diff --git a/script/librelease.sh b/script/librelease.sh
index 6125236..089b371 100755
--- a/script/librelease.sh
+++ b/script/librelease.sh
@@ -61,7 +61,12 @@ release_lib() {
exit 1
}
-echo Transferring
+echo Push git tag $tagname
+git push ssh://git.samba.org/data/git/samba.git
refs/tags/$tagname:refs/tags/$tagname || {
+ exit 1
+}
+
+echo Transferring for FTP
rsync -Pav $tarname.asc $tgzname master.samba.org:~ftp/pub/$lib/ || {
exit 1
}
--
Samba Shared Repository
Re: autobuild: intermittent test failure detected
Hi Andrew, The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-08-09-1406/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-09-1406/samba3.stderr http://git.samba.org/autobuild.flakey/2011-08-09-1406/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-09-1406/samba4.stderr http://git.samba.org/autobuild.flakey/2011-08-09-1406/samba4.stdout Do you have an idea why the samba3.blackbox.smbclient_auth.plain tests are flakey? I tried make test TESTS=secshare SMBD_VALGRIND=valgrind --num-callers=30 --log-file=smbd.vg.log --trace-children=yes, but didn't find anything. UNEXPECTED(error): creating directory /memdisk/autobuild/flakey/b28206/samba4/bin/ab/secserver/ncalrpc: File exists is very strange and I can't find the related code using git grep 'creating directory' metze signature.asc Description: OpenPGP digital signature
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 81e7655 s3:libsmb/cli*: use CLI_BUFFER_SIZE instead of cli-max_xmit
via 70c2bbe s3:torture/*: use CLI_BUFFER_SIZE instead of cli-max_xmit
from 46eacae script/librelease.sh: add git push for the release tag
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 81e765582bb231a3e182c96777a0eef045095c9a
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 2 23:05:31 2011 +0200
s3:libsmb/cli*: use CLI_BUFFER_SIZE instead of cli-max_xmit
The max_data parameter of trans2/nttrans calls are not bound
to cli-max_xmit. Even with cli-max_xmit, which means the max
size of the whole SMB pdu, we would get fragmented trans2/nttrans
replies. That's why we can also use our maximum, which is CLI_BUFFER_SIZE.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Aug 9 18:14:38 CEST 2011 on sn-devel-104
commit 70c2bbecde434264e0b54279f13159e9991efade
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 2 22:59:54 2011 +0200
s3:torture/*: use CLI_BUFFER_SIZE instead of cli-max_xmit
The max_data parameter of trans2/nttrans calls are not bound
to cli-max_xmit. Even with cli-max_xmit, which means the max
size of the whole SMB pdu, we would get fragmented trans2/nttrans
replies. That's why we can also use our maximum, which is CLI_BUFFER_SIZE.
metze
---
Summary of changes:
source3/libsmb/clidfs.c |2 +-
source3/libsmb/clifile.c |8
source3/libsmb/clilist.c |4 ++--
source3/libsmb/clirap.c | 14 +++---
source3/torture/nbench.c |2 +-
source3/torture/scanner.c |4 ++--
6 files changed, 17 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index a445649..a40ef89 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -654,7 +654,7 @@ NTSTATUS cli_dfs_get_referral(TALLOC_CTX *ctx,
NULL, 0x, 0, 0,
setup, 1, 0,
param, param_len, 2,
- NULL, 0, cli-max_xmit,
+ NULL, 0, CLI_BUFFER_SIZE,
recv_flags2,
NULL, 0, NULL, /* rsetup */
NULL, 0, NULL,
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index f9e3cbd..2a30d2c 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -612,7 +612,7 @@ struct tevent_req *cli_posix_getfacl_send(TALLOC_CTX
*mem_ctx,
return NULL;
}
subreq = cli_qpathinfo_send(state, ev, cli, fname, SMB_QUERY_POSIX_ACL,
- 0, cli-max_xmit);
+ 0, CLI_BUFFER_SIZE);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
@@ -4142,7 +4142,7 @@ static NTSTATUS cli_set_ea(struct cli_state *cli,
uint16_t setup_val,
status = cli_trans(talloc_tos(), cli, SMBtrans2, NULL, -1, 0, 0,
setup, 1, 0,
param, param_len, 2,
- data, data_len, cli-max_xmit,
+ data, data_len, CLI_BUFFER_SIZE,
NULL,
NULL, 0, NULL, /* rsetup */
NULL, 0, NULL, /* rparam */
@@ -4327,7 +4327,7 @@ struct tevent_req *cli_get_ea_list_path_send(TALLOC_CTX
*mem_ctx,
}
subreq = cli_qpathinfo_send(state, ev, cli, fname,
SMB_INFO_QUERY_ALL_EAS, 4,
- cli-max_xmit);
+ CLI_BUFFER_SIZE);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
@@ -5376,7 +5376,7 @@ struct tevent_req *cli_shadow_copy_data_send(TALLOC_CTX
*mem_ctx,
return NULL;
}
state-get_names = get_names;
- ret_size = get_names ? cli-max_xmit : 16;
+ ret_size = get_names ? CLI_BUFFER_SIZE : 16;
SIVAL(state-setup + 0, 0, FSCTL_GET_SHADOW_COPY_DATA);
SSVAL(state-setup + 2, 0, fnum);
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index ba3dd2b..ac10795 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -599,7 +599,7 @@ static struct tevent_req *cli_list_trans_send(TALLOC_CTX
*mem_ctx,
SMBtrans2, NULL, -1, 0, 0,
state-setup, 1, 0,
state-param, param_len, 10,
- NULL, 0, cli-max_xmit);
+ NULL, 0, CLI_BUFFER_SIZE);
if (tevent_req_nomem(subreq, req))
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1e76662 s3:vfs_prealloc: fix build on SLES8 from 81e7655 s3:libsmb/cli*: use CLI_BUFFER_SIZE instead of cli-max_xmit http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1e76662ae6aa77d7b6e9e8a0266fcb1a1320a7fb Author: Björn Jacke b...@sernet.de Date: Tue Aug 9 17:02:29 2011 +0200 s3:vfs_prealloc: fix build on SLES8 Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User: Björn Jacke b...@sernet.de Autobuild-Date: Tue Aug 9 19:29:08 CEST 2011 on sn-devel-104 --- Summary of changes: source3/modules/vfs_prealloc.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_prealloc.c b/source3/modules/vfs_prealloc.c index 4d1b2e1..fb2e46e 100644 --- a/source3/modules/vfs_prealloc.c +++ b/source3/modules/vfs_prealloc.c @@ -18,6 +18,7 @@ */ #include includes.h +#include system/filesys.h #include smbd/smbd.h /* Extent preallocation module. -- Samba Shared Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 25b034d Add 1st news/releases/3.6.0.html draft. from d506888 Announce Samba 3.6.0. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 25b034d2bf24dcc5c65bf0bf605b4467910e6697 Author: Lars Müller l...@samba.org Date: Tue Aug 9 20:32:49 2011 +0200 Add 1st news/releases/3.6.0.html draft. --- Summary of changes: news/releases/3.6.0.html | 150 ++ 1 files changed, 150 insertions(+), 0 deletions(-) create mode 100644 news/releases/3.6.0.html Changeset truncated at 500 lines: diff --git a/news/releases/3.6.0.html b/news/releases/3.6.0.html new file mode 100644 index 000..6c66f54 --- /dev/null +++ b/news/releases/3.6.0.html @@ -0,0 +1,150 @@ +h3a name=3.6.0Samba Team Releases Samba 3.6/a/h3 + +div class=article +pAugust 9th 2011./p + +The Samba Team is proud to announce the release of Samba 3.6, a major +new release of the award-winning Free Software file, print and +authentication server suite for Microsoft Windows #174; clients. + + +h4The First Free Software SMB2 Server/h4 + +pSamba 3.6 includes the first Free Software implementation of +Microsoft's new SMB2 file serving protocol. SMB2 within Samba is +implemented with a brand new asynchronous server architecture, +allowing Samba to display the performance enhancements SMB2 brings to +Microsoft networking technology./p + +pSamba's new SMB2 server has been tested by major vendors and has been +able to double the performance of some network applications when run +in conjunction with Microsoft Windows 7 #174; clients./p + +pFuture developments of our SMB2 server and client suite, in +combination with our expanding number of SMB2 tests, will keep driving +the performance improvements and improved compatibility with Microsoft +Windows that Samba users have come to expect from our software./p + +h4Improved Printing Support/h4 + +pThe Samba 3.6 print subsystem has been completely re-written to use +automatically generated remote procedure calls (RPC) and provides +greater compatibility with the Windows SPOOLSS print subsystem +architecture, including export of printer data via registry +interfaces./p + +pSamba 3.6 is the first on the wire compatible version of the +Microsoft SPOOLSS printing subsystem, and is the basis for our ongoing +work to create an implementation of Microsoft Windows printing +available separately from the Samba file server./p + +h4Improved Clustered File Server Support/h4 + +pBuilding on our success as the first commercial implementation of a +clustered SMB/CIFS server, Samba 3.6 provides industry-leading +scalability and performance as a clustered SMB2/SMB/CIFS file server, +using our clustered tdb (ctdb) technology - also available as Free +Software./p + +pWritten and tested to be compatible with most clustered file systems, +both Free Software and proprietary, Samba 3.6 with ctdb provides a +scalable clustered file server solution with full Windows file sharing +semantics./p + +pSamba and ctdb has been shipped in production file serving products +for many years, to some of the most demanding customers in the world./p + +h4Simplified Identity Mapping/h4 + +pSamba 3.6 has simplified the complex field of mapping Linux #174; and +UNIX #174; identities to Windows users and groups. Samba 3.6 contains a +new implementation of the identity mapping code which allows automatic +allocation of Linux and UNIX identities when Windows clients connect +to a Samba server, even in a clustered file serving configuration./p + +h4Greater Reliability/h4 + +pSamba 3.6 has been tested using our widely accepted smbtorture test +suite, created by the Samba Team to test Samba itself and now used by +most of the companies writing SMB2/SMB/CIFS file server software to +test their own products./p + +In addition, Samba is one of eleven open source projects that leading +software integrity vendor Coverity has certified as secure and has +reached Coverity Integrity Rung 2 certification./p + +h4Library Components/h4 + +pAs the Samba software matures, technologies created for use within +Samba have been spun-off as external libraries, available from the +following Web addresses:/p + +h5a href=http://talloc.samba.orgTalloc/a: Hierarchical memory allocator./h5 + +h5a href=http://tdb.samba.orgTDB/a: Super-fast key/value pair transactional database./h5 + +h5a href=http://ctdb.samba.orgClustered TDB/a: A cluster-aware version of tdb and the code behind all + Samba clustered file serving implementations./h5 + +h5a href=http://ldb.samba.orgLDB/a: High performance LDAP-style database access for applications./h5 + +h5a href=http://tevent.samba.orgTevent/a: Asynchronous Event subsystem, the basis for the new SMB2 + server implementation within Samba 3.6./h5 + +These libraries have been adopted by other
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 144f8dd WHATSNEW: Correct default value of smb2 max credits. via 1855480 WHATSNEW: Start release notes for Samba 3.6.1. via 8498acb VERSION: Bump version up to 3.6.1. from 7602225 WHATSNEW: Update changes since rc3. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 144f8dd732d47f1360741d516152993ac88cf9b9 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 9 20:49:39 2011 +0200 WHATSNEW: Correct default value of smb2 max credits. This has been changed by one of the last minute commits. Thanks to Christian Ambach for reporting! Karolin commit 185548092daa18a8630ae929a1372dc1e226c5f3 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 9 20:45:20 2011 +0200 WHATSNEW: Start release notes for Samba 3.6.1. Karolin commit 8498acb8f8c9e4db23f1845e00b7a76a38ba5d31 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 9 20:40:39 2011 +0200 VERSION: Bump version up to 3.6.1. Karolin --- Summary of changes: WHATSNEW.txt| 40 +++- source3/VERSION |2 +- 2 files changed, 40 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 4c147be..bf3950c 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,42 @@ = + Release Notes for Samba 3.6.1 + , 2011 + = + + +This is the latest stable release of Samba 3.6. + +Major enhancements in Samba 3.6.1 include: + + +Changes since 3.6.0: + + + + +## +Reporting bugs Development Discussion +### + +Please discuss this release on the samba-technical mailing list or by +joining the #samba-technical IRC channel on irc.freenode.net. + +If you do report problems then please try to send high quality +feedback. If you don't provide vital information to help us track down +the problem then you will probably be ignored. All bug reports should +be filed under the Samba 3.5 product in the project's Bugzilla +database (https://bugzilla.samba.org/). + + +== +== Our Code, Our Bugs, Our Responsibility. +== The Samba Team +== + +Release notes for older releases follow: + + + = Release Notes for Samba 3.6.0 August 9, 2011 = @@ -218,7 +256,7 @@ smb.conf changes multicast dns register New Yes ncalrpc dirNew send spnego principal New No - smb2 max credits New 128 + smb2 max credits New 8192 smb2 max read New 1048576 smb2 max trans New 1048576 smb2 max write New 1048576 diff --git a/source3/VERSION b/source3/VERSION index 8946805..f4e6bae 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=6 -SAMBA_VERSION_RELEASE=0 +SAMBA_VERSION_RELEASE=1 # Bug fix releases use a letter for the patch revision # -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-stable updated
The branch, v3-6-stable has been updated via 0f4a8b5 WHATSNEW: Correct default value of smb2 max credits. via e59355e WHATSNEW: Start release notes for Samba 3.6.1. via c250b2d VERSION: Bump version up to 3.6.1. from b1d9ddf WHATSNEW: Update changes since rc3. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable - Log - commit 0f4a8b54dffe3c825e0efb8290dff67138dc0719 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 9 20:49:39 2011 +0200 WHATSNEW: Correct default value of smb2 max credits. This has been changed by one of the last minute commits. Thanks to Christian Ambach for reporting! Karolin (cherry picked from commit 144f8dd732d47f1360741d516152993ac88cf9b9) commit e59355e28cb4b890eb0528df31f5bf5d1e2fad86 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 9 20:45:20 2011 +0200 WHATSNEW: Start release notes for Samba 3.6.1. Karolin (cherry picked from commit 185548092daa18a8630ae929a1372dc1e226c5f3) commit c250b2d97ddc0ab6634bc147619230880432cdca Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 9 20:40:39 2011 +0200 VERSION: Bump version up to 3.6.1. Karolin (cherry picked from commit 8498acb8f8c9e4db23f1845e00b7a76a38ba5d31) --- Summary of changes: WHATSNEW.txt| 40 +++- source3/VERSION |2 +- 2 files changed, 40 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 4c147be..bf3950c 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,42 @@ = + Release Notes for Samba 3.6.1 + , 2011 + = + + +This is the latest stable release of Samba 3.6. + +Major enhancements in Samba 3.6.1 include: + + +Changes since 3.6.0: + + + + +## +Reporting bugs Development Discussion +### + +Please discuss this release on the samba-technical mailing list or by +joining the #samba-technical IRC channel on irc.freenode.net. + +If you do report problems then please try to send high quality +feedback. If you don't provide vital information to help us track down +the problem then you will probably be ignored. All bug reports should +be filed under the Samba 3.5 product in the project's Bugzilla +database (https://bugzilla.samba.org/). + + +== +== Our Code, Our Bugs, Our Responsibility. +== The Samba Team +== + +Release notes for older releases follow: + + + = Release Notes for Samba 3.6.0 August 9, 2011 = @@ -218,7 +256,7 @@ smb.conf changes multicast dns register New Yes ncalrpc dirNew send spnego principal New No - smb2 max credits New 128 + smb2 max credits New 8192 smb2 max read New 1048576 smb2 max trans New 1048576 smb2 max write New 1048576 diff --git a/source3/VERSION b/source3/VERSION index 504743b..8278372 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=6 -SAMBA_VERSION_RELEASE=0 +SAMBA_VERSION_RELEASE=1 # Bug fix releases use a letter for the patch revision # -- Samba Shared Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via e1f7031 WHATSNEW: Correct default value of smb2 max credits. from 25b034d Add 1st news/releases/3.6.0.html draft. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit e1f7031a4230caf7cde33fd4b36c692b2825f2f8 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 9 21:12:58 2011 +0200 WHATSNEW: Correct default value of smb2 max credits. This has been changed by one of the last minute commits. Thanks to Christian Ambach for reporting! Karolin --- Summary of changes: history/samba-3.6.0.html |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/history/samba-3.6.0.html b/history/samba-3.6.0.html index 11e4a94..0acb13b 100755 --- a/history/samba-3.6.0.html +++ b/history/samba-3.6.0.html @@ -232,7 +232,7 @@ smb.conf changes multicast dns register New Yes ncalrpc dirNew send spnego principal New No - smb2 max credits New 128 + smb2 max credits New 8192 smb2 max read New 1048576 smb2 max trans New 1048576 smb2 max write New 1048576 -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via fd33829 tevent: change the version to 0.9.14 after the tevent_queue
changes
via c6363bb tevent: fix some comments in tevent.h
via 1533f17 tevent: add tevent_queue_add_entry() and
tevent_queue_add_optimize_empty()
via 6b7d58c tevent: splitout tevent_queue_add_internal() from
tevent_queue_add()
via aba9d48 tevent: allow tevent_queue_add() to take a NULL trigger
function
via 3c38ec7 tevent: add tevent_queue_running() function
from 1e76662 s3:vfs_prealloc: fix build on SLES8
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fd3382906a86aa7077aac535fee39cc5b441d682
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 9 16:12:40 2011 +0200
tevent: change the version to 0.9.14 after the tevent_queue changes
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Aug 9 23:02:17 CEST 2011 on sn-devel-104
commit c6363bb352daab5b5e4523df14ea8f20b630be75
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 9 16:05:36 2011 +0200
tevent: fix some comments in tevent.h
metze
commit 1533f1722de96f814c5e9de9aebc2892eb4bf882
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jul 28 10:45:22 2011 +0200
tevent: add tevent_queue_add_entry() and tevent_queue_add_optimize_empty()
This adds more flexible handling for the add operation:
- It allows the caller to remove a tevent_req from the queue
by calling talloc_free() on the returned tevent_queue_entry.
- It allows the caller to optimize for the empty queue case,
where it the caller wants to avoid the delay caused by
the immediate event.
metze
commit 6b7d58cb4ee3ed7796a8dc67c214a1b8439fbaeb
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 9 15:33:37 2011 +0200
tevent: splitout tevent_queue_add_internal() from tevent_queue_add()
metze
commit aba9d48f55b7e69af0967d0f435843c833357ec7
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jul 28 09:45:15 2011 +0200
tevent: allow tevent_queue_add() to take a NULL trigger function
This way the caller can add a blocker to the queue.
metze
commit 3c38ec72e74dd60b81964ebf661f5d5af8724968
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jul 28 09:46:34 2011 +0200
tevent: add tevent_queue_running() function
metze
---
Summary of changes:
.../ABI/{tevent-0.9.13.sigs = tevent-0.9.14.sigs} |3 +
lib/tevent/tevent.h| 95 ++-
lib/tevent/tevent_queue.c | 99 ++--
lib/tevent/wscript |2 +-
4 files changed, 187 insertions(+), 12 deletions(-)
copy lib/tevent/ABI/{tevent-0.9.13.sigs = tevent-0.9.14.sigs} (93%)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/ABI/tevent-0.9.13.sigs
b/lib/tevent/ABI/tevent-0.9.14.sigs
similarity index 93%
copy from lib/tevent/ABI/tevent-0.9.13.sigs
copy to lib/tevent/ABI/tevent-0.9.14.sigs
index 888ca0e..13c461c 100644
--- a/lib/tevent/ABI/tevent-0.9.13.sigs
+++ b/lib/tevent/ABI/tevent-0.9.14.sigs
@@ -41,7 +41,10 @@ tevent_fd_set_flags: void (struct tevent_fd *, uint16_t)
tevent_loop_allow_nesting: void (struct tevent_context *)
tevent_loop_set_nesting_hook: void (struct tevent_context *,
tevent_nesting_hook, void *)
tevent_queue_add: bool (struct tevent_queue *, struct tevent_context *, struct
tevent_req *, tevent_queue_trigger_fn_t, void *)
+tevent_queue_add_entry: struct tevent_queue_entry *(struct tevent_queue *,
struct tevent_context *, struct tevent_req *, tevent_queue_trigger_fn_t, void *)
+tevent_queue_add_optimize_empty: struct tevent_queue_entry *(struct
tevent_queue *, struct tevent_context *, struct tevent_req *,
tevent_queue_trigger_fn_t, void *)
tevent_queue_length: size_t (struct tevent_queue *)
+tevent_queue_running: bool (struct tevent_queue *)
tevent_queue_start: void (struct tevent_queue *)
tevent_queue_stop: void (struct tevent_queue *)
tevent_re_initialise: int (struct tevent_context *)
diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index 7ad566c..6e3ed76 100644
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -1347,6 +1347,7 @@ struct timeval tevent_timeval_current_ofs(uint32_t secs,
uint32_t usecs);
*/
struct tevent_queue;
+struct tevent_queue_entry;
#ifdef DOXYGEN
/**
@@ -1358,8 +1359,8 @@ struct tevent_queue;
*
* @return An allocated tevent queue on success, NULL on error.
*
- * @see tevent_start()
- * @see tevent_stop()
+ * @see tevent_queue_start()
+ * @see tevent_queue_stop()
*/
struct tevent_queue *tevent_queue_create(TALLOC_CTX *mem_ctx,
const char *name);
@@ -1381,6 +1382,8 @@ struct tevent_queue
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via cb9c66b Add some common include virtual and list libs from e1f7031 WHATSNEW: Correct default value of smb2 max credits. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit cb9c66b31c7e6f368eaefaa882191d9f0728a9b5 Author: Lars Müller l...@samba.org Date: Tue Aug 9 23:49:49 2011 +0200 Add some common include virtual and list libs Acked by obnox and kai. --- Summary of changes: news/releases/3.6.0.html | 78 ++ 1 files changed, 51 insertions(+), 27 deletions(-) Changeset truncated at 500 lines: diff --git a/news/releases/3.6.0.html b/news/releases/3.6.0.html index 6c66f54..d504675 100644 --- a/news/releases/3.6.0.html +++ b/news/releases/3.6.0.html @@ -1,14 +1,18 @@ -h3a name=3.6.0Samba Team Releases Samba 3.6/a/h3 +!--#include virtual=/samba/header.html -- + titleSamba - opening windows to a wider world/title +!--#include virtual=/samba/hack_samba_menu.html -- + + +h2a name=3.6.0Samba Team Releases Version 3.6/a/h2 -div class=article pAugust 9th 2011./p -The Samba Team is proud to announce the release of Samba 3.6, a major +pThe Samba Team is proud to announce the release of Samba 3.6, a major new release of the award-winning Free Software file, print and -authentication server suite for Microsoft Windows #174; clients. +authentication server suite for Microsoft Windows#174; clients./p -h4The First Free Software SMB2 Server/h4 +h3The First Free Software SMB2 Server/h3 pSamba 3.6 includes the first Free Software implementation of Microsoft's new SMB2 file serving protocol. SMB2 within Samba is @@ -18,14 +22,14 @@ Microsoft networking technology./p pSamba's new SMB2 server has been tested by major vendors and has been able to double the performance of some network applications when run -in conjunction with Microsoft Windows 7 #174; clients./p +in conjunction with Microsoft Windows 7#174; clients./p pFuture developments of our SMB2 server and client suite, in combination with our expanding number of SMB2 tests, will keep driving the performance improvements and improved compatibility with Microsoft Windows that Samba users have come to expect from our software./p -h4Improved Printing Support/h4 +h3Improved Printing Support/h3 pThe Samba 3.6 print subsystem has been completely re-written to use automatically generated remote procedure calls (RPC) and provides @@ -38,7 +42,7 @@ Microsoft SPOOLSS printing subsystem, and is the basis for our ongoing work to create an implementation of Microsoft Windows printing available separately from the Samba file server./p -h4Improved Clustered File Server Support/h4 +h3Improved Clustered File Server Support/h3 pBuilding on our success as the first commercial implementation of a clustered SMB/CIFS server, Samba 3.6 provides industry-leading @@ -54,15 +58,15 @@ semantics./p pSamba and ctdb has been shipped in production file serving products for many years, to some of the most demanding customers in the world./p -h4Simplified Identity Mapping/h4 +h3Simplified Identity Mapping/h3 -pSamba 3.6 has simplified the complex field of mapping Linux #174; and -UNIX #174; identities to Windows users and groups. Samba 3.6 contains a +pSamba 3.6 has simplified the complex field of mapping Linux#174; and +UNIX#174; identities to Windows users and groups. Samba 3.6 contains a new implementation of the identity mapping code which allows automatic allocation of Linux and UNIX identities when Windows clients connect to a Samba server, even in a clustered file serving configuration./p -h4Greater Reliability/h4 +h3Greater Reliability/h3 pSamba 3.6 has been tested using our widely accepted smbtorture test suite, created by the Samba Team to test Samba itself and now used by @@ -73,29 +77,49 @@ In addition, Samba is one of eleven open source projects that leading software integrity vendor Coverity has certified as secure and has reached Coverity Integrity Rung 2 certification./p -h4Library Components/h4 +h3Library Components/h3 pAs the Samba software matures, technologies created for use within Samba have been spun-off as external libraries, available from the following Web addresses:/p -h5a href=http://talloc.samba.orgTalloc/a: Hierarchical memory allocator./h5 +ul + +li +h4a href=http://talloc.samba.orgTalloc/a/h4 +pHierarchical memory allocator./p +/li + +li +h4a href=http://tdb.samba.orgTDB/a/h4 +pSuper-fast key/value pair transactional database./p +/li + +li +h4a href=http://ctdb.samba.orgClustered TDB/a/h4 +pA cluster-aware version of tdb and the code behind all + Samba clustered file serving implementations./p +/li -h5a href=http://tdb.samba.orgTDB/a: Super-fast key/value pair transactional database./h5 +li +h4a
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4a5e9cf s4:subtree_rename LDB module - fix the move/rename
constraints
via 4659b07 s4-drs: In dcesrv_drsuapi_DsRemoveDSServer use the subtree
control to delete the NTDS entry
via dd90216 s4-dsdb: avoid printing a pointless debug line
via 87e7802 s4-drsuapi: crackname search also for deleted objects
via 1b97b2f s4: create a small script to test drsuapi/crackname
from fd33829 tevent: change the version to 0.9.14 after the tevent_queue
changes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4a5e9cf0ed909faef1325efff4581a4c5ee8d736
Author: Matthias Dieter Wallnöfer m...@samba.org
Date: Fri Apr 29 11:38:56 2011 +0200
s4:subtree_rename LDB module - fix the move/rename constraints
s4:subtree_rename LDB module - fix the move/rename constraints
By the inspiration of an email request by ekacnet I have rechecked the
move/rename constraints and re-read the chapter 3.1.1.5.4.1 located in the
MS-ADTS technical documentation.
It really turns out that the constraint checking is only performed on
the root object of a request.
In addition add my copyright notice (I've written these constraint checks).
Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Wed Aug 10 01:05:19 CEST 2011 on sn-devel-104
commit 4659b07eb9608acaf5b49d8919c98e224d2b805c
Author: Matthieu Patou m...@matws.net
Date: Wed Aug 10 01:36:01 2011 +0400
s4-drs: In dcesrv_drsuapi_DsRemoveDSServer use the subtree control to
delete the NTDS entry
This entry has most of the time subelements (connections between DCs)
that will forbid a simple (non recursive) delete
commit dd902164d270be60ccafb296105f4c1d5edd87df
Author: Matthieu Patou m...@matws.net
Date: Mon Aug 8 14:41:54 2011 +0400
s4-dsdb: avoid printing a pointless debug line
commit 87e7802722e62b5df1d8f63d49f4a54eaf3f61cd
Author: Matthieu Patou matthieu.pa...@matws.net
Date: Sun Jul 31 00:54:01 2011 +0400
s4-drsuapi: crackname search also for deleted objects
commit 1b97b2f8ffce2bd7c93155bab337dd90665f7013
Author: Matthieu Patou m...@matws.net
Date: Sun Jul 31 00:48:06 2011 +0400
s4: create a small script to test drsuapi/crackname
---
Summary of changes:
source4/dsdb/samdb/cracknames.c |5 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c |2 +-
source4/dsdb/samdb/ldb_modules/subtree_rename.c | 17 ++---
source4/rpc_server/drsuapi/dcesrv_drsuapi.c |3 +-
source4/scripting/devel/crackname | 75 +++
5 files changed, 89 insertions(+), 13 deletions(-)
create mode 100755 source4/scripting/devel/crackname
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index d922482..21a473d 100644
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -839,13 +839,16 @@ static WERROR DsCrackNameOneFilter(struct ldb_context
*sam_ctx, TALLOC_CTX *mem_
dsdb_flags = DSDB_SEARCH_SEARCH_ALL_PARTITIONS;
search_dn = ldb_get_root_basedn(sam_ctx);
}
+ if (format_desired == DRSUAPI_DS_NAME_FORMAT_GUID){
+dsdb_flags = dsdb_flags| DSDB_SEARCH_SHOW_DELETED;
+ }
/* search with the 'phantom root' flag */
ret = dsdb_search(sam_ctx, mem_ctx, res,
search_dn,
LDB_SCOPE_SUBTREE,
result_attrs,
- DSDB_SEARCH_SEARCH_ALL_PARTITIONS,
+ dsdb_flags,
%s, result_filter);
if (ret != LDB_SUCCESS) {
DEBUG(2, (DsCrackNameOneFilter phantom root search
failed: %s,
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 706ca33..54741e6 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -4188,7 +4188,7 @@ static int replmd_replicated_uptodate_modify(struct
replmd_replicated_request *a
*/
nrf_el-flags = LDB_FLAG_MOD_REPLACE;
- if (DEBUGLVL(4)) {
+ if (CHECK_DEBUGLVL(4)) {
char *s = ldb_ldif_message_string(ldb, ar,
LDB_CHANGETYPE_MODIFY, msg);
DEBUG(4, (DRS replication uptodate modify message:\n%s\n, s));
talloc_free(s);
diff --git a/source4/dsdb/samdb/ldb_modules/subtree_rename.c
b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
index f26a99e..a4714ac 100644
--- a/source4/dsdb/samdb/ldb_modules/subtree_rename.c
+++
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-460-g0e0c4f2
The branch, 1.2 has been updated
via 0e0c4f20610f085da78d7e0b7224b8c437dceaa0 (commit)
via fd3aeab959c866a1fd321a453164287cb42d758b (commit)
from 8ec198b2fd2d33420714a154af99417c31cb6a9c (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2
- Log -
commit 0e0c4f20610f085da78d7e0b7224b8c437dceaa0
Author: Martin Schwenke mar...@meltin.net
Date: Mon Aug 8 13:13:59 2011 +1000
Eventscripts: New configuration variable CTDB_SERVICE_AUTOSTARTSTOP.
Some of the current auto-start/stop logic is broken, particularly for
Samba. Fixing it is non-trivial.
If $CTDB_SERVICE_AUTOSTARTSTOP is yes then auto-start/stop services
when told to newly manage or no longer manage them. This defaults to
yes.
However, if using a canned configuration file that doesn't set
$CTDB_SERVICE_AUTOSTARTSTOP then this stops the auto-start-stop logic
from working. Therefore, this works around CQ S1026685 - on the
system in question another daemon controls service auto-start/stop and
CTDB just gets in the way.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit fd3aeab959c866a1fd321a453164287cb42d758b
Author: Martin Schwenke mar...@meltin.net
Date: Fri Aug 5 16:39:57 2011 +1000
Eventscripts - weaken TCP port check message if CTDB has just been started.
Sometimes smbd and other services can take a while to start,
especially when there is a lot of activity after ctdbd has just
started. The TCP port check can then pollute the logs with lots of
ERROR messages and possibly extra debug.
This creates a flag file when a service is started (but not restarted)
and this flag is removed the first time that TCP port checks succeed
for that service. When a port check fails and the flag file still
exists, a less extreme INFO message is printed rather than the usual
ERROR message. This means that until the node actually becomes
healthy we see more friendly messages.
The subtext is that we're hearing false positive reports recreates
of CQ S1024874 (samba stopped responding on port 445) quite often when
ctdbd is started. This reduces the chances of people reporting such
false recreates...
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/ctdb.sysconfig |4
config/functions | 34 +-
2 files changed, 37 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index 011593d..b0ee474 100644
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -286,6 +286,10 @@ CTDB_DEBUGLEVEL=ERR
# This parameter controls how many entries we allow for this in memory log
# CTDB_LOG_RINGBUF_SIZE=50
+# Should CTDB automatically start and stop services when it is told to
+# newly manage or no longer manage them?
+CTDB_SERVICE_AUTOSTARTSTOP=yes
+
#
#
# set any default tuning options for ctdb
diff --git a/config/functions b/config/functions
index 567191d..1f50e70 100755
--- a/config/functions
+++ b/config/functions
@@ -191,8 +191,27 @@ ctdb_check_directories() {
# check a set of tcp ports
# usage: ctdb_check_tcp_ports ports...
##
+
+# This flag file is created when a service is initially started. It
+# is deleted the first time TCP port checks for that service succeed.
+# Until then ctdb_check_tcp_ports() prints a more subtle error
+# message if a port check fails.
+_ctdb_check_tcp_common ()
+{
+_ctdb_service_started_file=$ctdb_fail_dir/$service_name.started
+}
+
+ctdb_check_tcp_init ()
+{
+_ctdb_check_tcp_common
+mkdir -p ${_ctdb_service_started_file%/*} # dirname
+touch $_ctdb_service_started_file
+}
+
ctdb_check_tcp_ports()
{
+_ctdb_check_tcp_common
+
_cmd='netstat -l -t -n'
_ns=$($_cmd)
for _p ; do # process each function argument (port)
@@ -205,13 +224,22 @@ ctdb_check_tcp_ports()
done
# We didn't match the port, so flag an error, print some debug
- cat EOF
+ if [ ! -f $_ctdb_service_started_file ] ; then
+ cat EOF
ERROR: $service_name tcp port $_p is not responding
$_cmd shows this output:
$_ns
EOF
+ else
+ echo INFO: $service_name tcp port $_p is not responding
+ fi
+
return 1
done
+
+rm -f $_ctdb_service_started_file
+
+return 0
}
##
@@ -701,6 +729,9 @@ is_ctdb_managed_service ()
ctdb_start_stop_service ()
{
+# Do nothing unless configured to...
+[ $CTDB_SERVICE_AUTOSTARTSTOP = yes ] || return 0
+
_service_name=${1:-${service_name}}
[ $event_name = monitor ] || return 0
@@ -732,6 +763,7 @@ ctdb_service_start ()
service
[SCM] CTDB repository - branch master updated - ctdb-1.10-320-g20984a2
The branch, master has been updated via 20984a28d9617c0b7a5868057594920ed3f1a2c7 (commit) via ac164a0d731fc5d46ab7d05112484c45ecb21100 (commit) via cf61c5d1517d3979ce67e7b9bc836d040db8a416 (commit) via 92eac08764e87bd3042d2a24ed36b2a339a04960 (commit) via 18e0236754507a9475653f04bb239c5d46ba51de (commit) via 87e6a4a23a6ae6c276e9628ce513663f47b4ee77 (commit) via 5ae002c7513b1b2aa5136437a1a19f8cd179b869 (commit) via a273554791c2a5281aee28f8e2be0c514e14c91e (commit) via 9a084a121f629b2c1bcefc1e4c4a4a5cacf53987 (commit) via 414c4d8e901353a3529f82746ffe2e4983a155d6 (commit) via 432e6c1d5137142ce6b0314a965747524406c17e (commit) via 0e14213dfa841080c07fa6fce23b192493adb926 (commit) via c12c97598afcd07ce4876b26e0b734bc825e54c1 (commit) via 73cfc304513358e99e6505c95f44a4d319201309 (commit) via 7758fd0591467a758e5d22404aa59fcbc1e1cb8b (commit) via 6c8eedb21a5e231d4a26ac26706ea51f348a27e0 (commit) via 98ccdc6241a73036c4f210bb510f1cb5cff588cc (commit) via 91e74cb01a11012e41ef9633c98f13ddbb2e5908 (commit) via 151151353e58f59b15be9313e22b7d4f71ee0de8 (commit) via d3271d316f6d1561e66cbc4cc1b1e8af63895459 (commit) via 2702592b5911cfa93625e36f4a0d1c4414c0e3e9 (commit) via 5b4c712aab3edc0059f2e5a6730b7fdcf7e5f4ec (commit) via 95d9a1e19655461288a2c7e52abf9d01ab23e05a (commit) via 7130963430e530fa4dd5e6fe132bd7122349cc5f (commit) via 4fa2073649f25993de4b8ef6b3e7172068a83a29 (commit) via b13ac3bdaf326a6cdfd87da9195eb9630806c418 (commit) via 01c941ab4c764c5aac0d7c0f90fca89775956d41 (commit) via 58c696dc600f1073e693930da061776b6fb199f2 (commit) via 557ac30e60516742da10b83bf41430c977a2 (commit) via ef7e5da6241e326267800cd2bd53fb33a0386c2d (commit) via bc94197025a1ec6efaed5586a725f698991b2b17 (commit) via b675ca3c25b7155b9681128822d1280018ef68bb (commit) via b723f23fc9c38e75b91d43306d606be26c55d31d (commit) via d0c6d9b19f0dd8946f9504b0d1cf50dd21f7a592 (commit) via f5b7cb03aaf19fb4b12fc3f0c14d98ee2d7b0798 (commit) via 2dfdc997f432d522034922b43cb6f8f878d11ba7 (commit) via 70ebb30b90956bb1212287d267ccb72ea83740ca (commit) via 61b7f0172ba5c83c847c29fac3582c25c7754b68 (commit) via 5a3d5c6b1ca3682bb45104e50061871dec6e9b1d (commit) via 05851d50b0078de8bf4691442d718825adca6fe8 (commit) via 637f9d8af517b73c72ed8f3cc2a2661f11eb2126 (commit) via f5fd361cadb3ea18d29e2d7215a7853718e48d00 (commit) via 3f04793f391c63b78ffb9c9851ab3f0daf3ed50a (commit) via a6dfb76cfa759f6f9409f24368111c4f85ca0fbf (commit) via f43c9a7604b779bb6257ddb2bf3cbe266d496a63 (commit) via ebd53b66b0cc66d9d04830781886234167fc2164 (commit) from 9ea41d2fab612772f861270c8a59c01c43bd3a4c (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 20984a28d9617c0b7a5868057594920ed3f1a2c7 Merge: ac164a0d731fc5d46ab7d05112484c45ecb21100 18e0236754507a9475653f04bb239c5d46ba51de Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Aug 10 15:22:46 2011 +1000 Merge remote branch 'martins/eventscript.13.per_ip_routing' commit ac164a0d731fc5d46ab7d05112484c45ecb21100 Merge: cf61c5d1517d3979ce67e7b9bc836d040db8a416 151151353e58f59b15be9313e22b7d4f71ee0de8 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Aug 10 15:18:16 2011 +1000 Merge remote branch 'martins/eventscript_tests' commit cf61c5d1517d3979ce67e7b9bc836d040db8a416 Merge: 92eac08764e87bd3042d2a24ed36b2a339a04960 2702592b5911cfa93625e36f4a0d1c4414c0e3e9 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Aug 10 15:15:12 2011 +1000 Merge remote branch 'martins/eventscripts_relative' commit 92eac08764e87bd3042d2a24ed36b2a339a04960 Merge: 9ea41d2fab612772f861270c8a59c01c43bd3a4c 0e14213dfa841080c07fa6fce23b192493adb926 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Aug 10 15:11:00 2011 +1000 Merge remote branch 'martins/test_suite' commit 18e0236754507a9475653f04bb239c5d46ba51de Author: Martin Schwenke mar...@meltin.net Date: Thu Dec 16 08:42:44 2010 +1100 Evenscripts: update 13.per_ip_routing to use ctdb_setup_service_state_dir. Signed-off-by: Martin Schwenke mar...@meltin.net commit 87e6a4a23a6ae6c276e9628ce513663f47b4ee77 Author: Martin Schwenke mar...@meltin.net Date: Tue Jun 28 17:29:49 2011 +1000 Scripts: add note about not using absolute command paths to README. Signed-off-by: Martin Schwenke mar...@meltin.net commit 5ae002c7513b1b2aa5136437a1a19f8cd179b869 Author: Martin Schwenke mar...@meltin.net Date: Tue Jun 28 15:19:34 2011 +1000 Add a README to the config/ subdirectory. This includes a comment about using POSIX Bourne shell, including a
[SCM] CTDB repository - branch master updated - ctdb-1.10-326-gabe67d6
The branch, master has been updated
via abe67d6af1e0594641b98facc3534059263e1745 (commit)
via fb87fa9273db4f82e801a331b5d95059d64dfb8e (commit)
via b8493ceb35b125a390b1e83464fb9ff72f2e1495 (commit)
via cfa4102ec0d97e1d1d3c1ce6407ffacdb85c2e10 (commit)
via afafeb1fb12384bddff470d38b534f513a1f3b07 (commit)
via 797ca65bdd59b14325ffd32b4d4140e9b01dbe71 (commit)
from 20984a28d9617c0b7a5868057594920ed3f1a2c7 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit abe67d6af1e0594641b98facc3534059263e1745
Merge: b8493ceb35b125a390b1e83464fb9ff72f2e1495
fb87fa9273db4f82e801a331b5d95059d64dfb8e
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Aug 10 15:32:24 2011 +1000
Merge remote branch 'martins/eventscript.20.multipathd'
commit fb87fa9273db4f82e801a331b5d95059d64dfb8e
Merge: 797ca65bdd59b14325ffd32b4d4140e9b01dbe71
cfa4102ec0d97e1d1d3c1ce6407ffacdb85c2e10
Author: Martin Schwenke mar...@meltin.net
Date: Wed Aug 10 15:32:11 2011 +1000
Merge branch 'eventscript.62.cnfs' into eventscript.20.multipathd
commit b8493ceb35b125a390b1e83464fb9ff72f2e1495
Merge: 20984a28d9617c0b7a5868057594920ed3f1a2c7
cfa4102ec0d97e1d1d3c1ce6407ffacdb85c2e10
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Aug 10 15:31:56 2011 +1000
Merge remote branch 'martins/eventscript.62.cnfs'
commit cfa4102ec0d97e1d1d3c1ce6407ffacdb85c2e10
Merge: afafeb1fb12384bddff470d38b534f513a1f3b07
18e0236754507a9475653f04bb239c5d46ba51de
Author: Martin Schwenke mar...@meltin.net
Date: Wed Aug 10 15:31:13 2011 +1000
Merge branch 'eventscript.13.per_ip_routing' into eventscript.62.cnfs
commit afafeb1fb12384bddff470d38b534f513a1f3b07
Author: Martin Schwenke mar...@meltin.net
Date: Thu Dec 16 08:48:21 2010 +1100
Evenscripts: update 61.cnfs to use ctdb_setup_service_state_dir.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 797ca65bdd59b14325ffd32b4d4140e9b01dbe71
Author: Martin Schwenke mar...@meltin.net
Date: Thu Dec 16 08:45:28 2010 +1100
Evenscripts: update 20.multipathd to use ctdb_setup_service_state_dir.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/events.d/20.multipathd | 11 +++
config/events.d/62.cnfs | 14 +-
2 files changed, 8 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/20.multipathd b/config/events.d/20.multipathd
index 73b6054..1bf7070 100755
--- a/config/events.d/20.multipathd
+++ b/config/events.d/20.multipathd
@@ -16,7 +16,9 @@ loadconfig
exit 0
}
-MPFAILURE=$CTDB_VARDIR/state/multipathd/failure
+ctdb_setup_service_state_dir
+
+MPFAILURE=$service_state_dir/failure
multipathd_check_background()
{
@@ -75,13 +77,6 @@ multipathd_check()
}
case $1 in
-startup)
- # create a state directory to keep/track the multipath device
- # state
- mkdir -p $CTDB_VARDIR/state/multipathd
- exit 0
- ;;
-
monitor)
multipathd_check
[ $? = 0 ] || {
diff --git a/config/events.d/62.cnfs b/config/events.d/62.cnfs
index af4ecc3..3cc56e3 100755
--- a/config/events.d/62.cnfs
+++ b/config/events.d/62.cnfs
@@ -5,13 +5,12 @@
loadconfig
-STATEDIR=$CTDB_VARDIR/state/gpfs
-
+ctdb_setup_service_state_dir gpfs
check_if_healthy() {
-mkdir -p $STATEDIR/fs
+mkdir -p $service_state_dir/fs
-[ -f $STATEDIR/gpfsnoquorum ] {
+[ -f $service_state_dir/gpfsnoquorum ] {
logger No GPFS quorum. Node is UNHEALTHY
$CTDB_BASE/events.d/62.cnfs unhealthy No GPFS quorum. Nodfe
is UNHEALTHY.
exit 0
@@ -23,21 +22,18 @@ check_if_healthy() {
case $1 in
startup)
-mkdir -p $STATEDIR
check_if_healthy
;;
gpfsquorumreached)
-mkdir -p $STATEDIR
-rm -f $STATEDIR/gpfsnoquorum
+rm -f $service_state_dir/gpfsnoquorum
logger GPFS quorum has been reached.
check_if_healthy
;;
gpfsquorumloss)
-mkdir -p $STATEDIR
-touch $STATEDIR/gpfsnoquorum
+touch $service_state_dir/gpfsnoquorum
logger GPFS quorum has been lost.
$CTDB_BASE/events.d/62.cnfs unhealthy GPFS quorum was lost! Marking
node as UNHEALTHY.
;;
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.10-331-g6c28786
The branch, master has been updated
via 6c287861e780ba985e7ae7a61c1ee462b925e09e (commit)
via 8723b88b0b2bbeece38c74c77c50e8d8b3e2d5ca (commit)
via 1b3f2dd62efb240f8486016fe0f8dfb73d6ccc66 (commit)
via a5ce2adaa39f077f56582072a97bb64d0eba4b4d (commit)
via 28379ca0f747c5952d690a451834ce7421adfd34 (commit)
from abe67d6af1e0594641b98facc3534059263e1745 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 6c287861e780ba985e7ae7a61c1ee462b925e09e
Merge: abe67d6af1e0594641b98facc3534059263e1745
8723b88b0b2bbeece38c74c77c50e8d8b3e2d5ca
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Aug 10 15:36:20 2011 +1000
Merge remote branch 'martins/eventscript.00.ctdb'
commit 8723b88b0b2bbeece38c74c77c50e8d8b3e2d5ca
Merge: 1b3f2dd62efb240f8486016fe0f8dfb73d6ccc66
fb87fa9273db4f82e801a331b5d95059d64dfb8e
Author: Martin Schwenke mar...@meltin.net
Date: Wed Aug 10 15:32:58 2011 +1000
Merge branch 'eventscript.20.multipathd' into eventscript.00.ctdb
commit 1b3f2dd62efb240f8486016fe0f8dfb73d6ccc66
Author: Martin Schwenke mar...@meltin.net
Date: Fri Dec 17 16:23:31 2010 +1100
Eventscripts: fix dangerous rm -rf in 00.ctdb init event.
Also remove some unnecessary absolute paths for commands, which were
making the code slightly difficult to read.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit a5ce2adaa39f077f56582072a97bb64d0eba4b4d
Author: Martin Schwenke mar...@meltin.net
Date: Fri Dec 17 16:21:53 2010 +1100
Eventscripts: 00.ctdb uses $service_state_dir, neaten
update_config_from_tdb().
This also fixes a bug where update_config_from_tdb() used an incorrect
filename in one place.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 28379ca0f747c5952d690a451834ce7421adfd34
Author: Martin Schwenke mar...@meltin.net
Date: Fri Nov 19 14:32:28 2010 +1100
00.ctdb eventscript removes all files from $ctdb_active_dir.
Without this you can get into a situation where ctdbd can not start.
If the active file for a service exists but the service is not
running, then trying to stop the service may fail, causing the
eventscript to exit from ctdb_start_stop_service().
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/events.d/00.ctdb | 37 ++---
1 files changed, 22 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/00.ctdb b/config/events.d/00.ctdb
index 9df5af4..31f8fdc 100755
--- a/config/events.d/00.ctdb
+++ b/config/events.d/00.ctdb
@@ -12,28 +12,35 @@
. $CTDB_BASE/functions
loadconfig
+ctdb_setup_service_state_dir ctdb
+
+#
update_config_from_tdb() {
- # Pull optional ctdb configuration data out of config.tdb
- PUBLICADDRESSESKEY='public_addresses:node#'`ctdb -t 1 xpnn|sed -e
s/.*://`
- rm -f $CTDB_VARDIR/state/public_addresses
- ctdb pfetch config.tdb $PUBLICADDRESSESKEY
$CTDB_VARDIR/state/public_addresses 2/dev/null
- [ $? = 0 ] [ `stat --format=%s
/etc/ctdb/state/public_addresses` != 0 ] [ ! -z $CTDB_PUBLIC_ADDRESSES ]
{
- diff $CTDB_VARDIR/state/public_addresses $CTDB_PUBLIC_ADDRESSES
/dev/null 2/dev/null
- [ $? = 0 ] || {
- echo CTDB public address configuration had been updated.
- echo Extracting new configuration from database.
- diff $CTDB_VARDIR/state/public_addresses
$CTDB_PUBLIC_ADDRESSES
- cp $CTDB_VARDIR/state/public_addresses
$CTDB_PUBLIC_ADDRESSES
- echo Restarting CTDB
- service ctdb restart
- }
- }
+
+# Pull optional ctdb configuration data out of config.tdb
+_key=public_addresses:node#$(ctdb -t 1 xpnn|sed -e 's/.*://')
+_t=$service_state_dir/public_addresses
+rm -f $_t
+
+if ctdb pfetch config.tdb $_key $_t 2/dev/null \
+ [ -s $_t -a -n $CTDB_PUBLIC_ADDRESSES] \
+ ! cmp -s $_t $CTDB_PUBLIC_ADDRESSES ; then
+
+ echo CTDB public address configuration has changed.
+ echo Extracting new configuration from database.
+ diff $_t $CTDB_PUBLIC_ADDRESSES
+ cp $_t $CTDB_PUBLIC_ADDRESSES
+ echo Restarting CTDB
+ service ctdb restart
+fi
}
case $1 in
init)
# make sure we have a blank state directory for the scripts to work
with
rm -rf $CTDB_VARDIR/state
+ # Look at the pattern - this should not be -rf!!!
+ rm -f $ctdb_managed_dir/*
mkdir -p $CTDB_VARDIR/state || {
ret=$?
echo mkdir -p $CTDB_VARDIR/state - failed - $ret
--
CTDB repository
