svn commit: samba-web r1358 - in trunk: . history
Author: kseeger Date: 2010-01-15 03:22:00 -0700 (Fri, 15 Jan 2010) New Revision: 1358 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1358 Log: -Move older entries to the history -Fix typo Karolin Modified: trunk/history/index.html trunk/index.html Changeset: Modified: trunk/history/index.html === --- trunk/history/index.html2010-01-14 11:49:38 UTC (rev 1357) +++ trunk/history/index.html2010-01-15 10:22:00 UTC (rev 1358) @@ -6,8 +6,8 @@ div class=latest ul - liLatest Release mdash; a href=/samba/#latestSamba 3.4.3/a/li - liCurrent Stable Release mdash; a href=/samba/#latestSamba 3.4.3/a/li + liLatest Release mdash; a href=/samba/#latestSamba 3.4.4/a/li + liCurrent Stable Release mdash; a href=/samba/#latestSamba 3.4.4/a/li !-- Second link will point to #stable on this page when current release is a development release -- /ul /div @@ -17,6 +17,129 @@ h2Previous Release Announcements/h2 +h415 December 2009/h4 + +p class=headlineSamba 3.5.0pre2 Available for Download/p + +pThe a href=/samba/ftp/pre/samba-3.5.0pre2.tar.gzSamba 3.5.0pre2 +source code/a can be downloaded now. This is the second preview release of +the Samba 3.5 series. It is emnot/em intended for use on production +servers. The a href=/samba/ftp/pre/samba-3.5.0pre2.tar.ascGnuPG +signature is for the emun/emcompressed tarball/a. +Please see the a href=/samba/ftp/pre/WHATSNEW-3-5-0pre2.txtRelease Notes/a +for more information on this release. +Precompiled packages will be made available on a volunteer basis and can be +found in the a href=/samba/ftp/Binary_Packages/Binary_Packages download +area/a./p + +h426 November 2009/h4 + +p class=headlineSamba 3.5.0pre1 Available for Download/p + +pThe a href=/samba/ftp/pre/samba-3.5.0pre1.tar.gzSamba 3.5.0pre1 +source code/a can be downloaded now. This is the first preview release of +the Samba 3.5 series. It is emnot/em intended for use on production +servers. The a href=/samba/ftp/pre/samba-3.5.0pre1.tar.ascGnuPG +signature is for the emun/emcompressed tarball/a. +Please see the a href=/samba/ftp/pre/WHATSNEW-3-5-0pre1.txtRelease Notes/a +for more information on this release. +Precompiled packages will be made available on a volunteer basis and can be +found in the a href=/samba/ftp/Binary_Packages/Binary_Packages download +area/a./p + +h429 October 2009/h4 +p class=headlineSamba 3.4.3 Available for Download/p + +pThis is the latest stable release of the Samba 3.4 series./p + +pThe uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +a href=/samba/ftp/stable/samba-3.4.3.tar.gzdownloaded now/a. +See a href=/samba/history/samba-3.4.3.htmlthe release notes +for more info/a./p +A a href=/samba/ftp/patches/patch-3.4.2-3.4.3.diffs.gzpatch against Samba 3.4.2/a +is also available. See a href=/samba/history/samba-3.4.3.html +the release notes for more info/a./p + +h415 October 2009/h4 +p class=headlineSamba 3.3.9 Available for Download/p + +pThis is the latest stable release of the Samba 3.3 series/p + +pThe uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +a href=/samba/ftp/stable/samba-3.3.9.tar.gzdownloaded now/a. +A a href=/samba/ftp/patches/patch-3.3.8-3.3.9.diffs.gzpatch against Samba 3.3.8/a +is also available. See a href=/samba/history/samba-3.3.9.html +the release notes for more info/a./p + +h41 October 2009/h4 +p class=headlineSamba 3.4.2 Available for Download/p + +pThis is a security release to address +a href=/samba/security/CVE-2009-2813.htmlCVE-2009-2813/a, +a href=/samba/security/CVE-2009-2948.htmlCVE-2009-2948/a and +a href=/samba/security/CVE-2009-2906.htmlCVE-2009-2906/a. +Patches for all current versions and security advisories +are available on our a href=/samba/security/security +page/a./p + +pThe uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +a href=/samba/ftp/stable/samba-3.4.2.tar.gzdownloaded now/a. +See a href=/samba/history/samba-3.4.2.htmlthe release notes for more +info/a./p + +h41 October 2009/h4 +p class=headlineSamba 3.3.8 Available for Download/p + +pThis is a security release to address +a href=/samba/security/CVE-2009-2813.htmlCVE-2009-2813/a, +a href=/samba/security/CVE-2009-2948.htmlCVE-2009-2948/a and +a href=/samba/security/CVE-2009-2906.htmlCVE-2009-2906/a. +Patches for all current versions and security advisories +are available on our a href=/samba/security/security +page/a./p + +pThe uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via af2a075... Part 4 of bug #7028 - include scannedonly VFS module via dff5d81... Fix two uses of strncat - strlcat. Ensure proper use of strncpy when setting socket name. via f692d27... s3: Lift the version of the scannedonly VFS module (cherry picked from commit 2d4dda0688d5c88fb73ae17db970afe9d0f77f6a) via e04a732... Bug #7028 part1 from fd04e3a... Fix bug #7033 - SMBrmdir call always returns true, even on failure to delete a directory. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit af2a075f2c8feaf4961c25693ec973fb7ae6d524 Author: Olivier Sessink oliviersess...@gmail.com Date: Thu Jan 14 12:13:14 2010 -0800 Part 4 of bug #7028 - include scannedonly VFS module Fix some issues with handling names ending in '/'. (cherry picked from commit 3c42e11ff398d0307a480d49191aae3bf9869cd9) commit dff5d81d12da94707d586ab8842c96b05fa713a1 Author: Jeremy Allison j...@samba.org Date: Tue Jan 12 21:18:36 2010 -0800 Fix two uses of strncat - strlcat. Ensure proper use of strncpy when setting socket name. Jeremy. (cherry picked from commit ed457e07b9bdc0acda9dc52307d8bc2118f32f06) commit f692d27c9edc187ebdc080ff71fc5df24b607c55 Author: Volker Lendecke v...@samba.org Date: Tue Jan 12 22:58:51 2010 +0100 s3: Lift the version of the scannedonly VFS module (cherry picked from commit 2d4dda0688d5c88fb73ae17db970afe9d0f77f6a) commit e04a7325766fbf35ec45bb431481b79277d89f8e Author: Olivier Sessink oliviersess...@gmail.com Date: Wed Jan 13 14:53:27 2010 -0800 Bug #7028 part1 s3: Add the scannedonly vfs virus scanner interface module --- Summary of changes: source3/Makefile.in |5 + source3/configure.in |3 +- source3/modules/vfs_scannedonly.c | 990 + 3 files changed, 997 insertions(+), 1 deletions(-) create mode 100644 source3/modules/vfs_scannedonly.c Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 66f51e2..cdf2d38 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -739,6 +739,7 @@ VFS_ONEFS_SHADOW_COPY_OBJ = modules/vfs_onefs_shadow_copy.o modules/onefs_shadow PERFCOUNT_ONEFS_OBJ = modules/perfcount_onefs.o PERFCOUNT_TEST_OBJ = modules/perfcount_test.o VFS_DIRSORT_OBJ = modules/vfs_dirsort.o +VFS_SCANNEDONLY_OBJ = modules/vfs_scannedonly.o PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o @@ -2819,6 +2820,10 @@ bin/dirso...@shlibext@: $(BINARY_PREREQS) $(VFS_DIRSORT_OBJ) @echo Building plugin $@ @$(SHLD_MODULE) $(VFS_DIRSORT_OBJ) +bin/scannedon...@shlibext@: $(BINARY_PREREQS) $(VFS_SCANNEDONLY_OBJ) + @echo Building plugin $@ + @$(SHLD_MODULE) $(VFS_SCANNEDONLY_OBJ) + # ## IdMap NSS plugins diff --git a/source3/configure.in b/source3/configure.in index e527a18..89994af 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -387,7 +387,7 @@ dnl These have to be built static: default_static_modules=pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template dnl These are preferably build shared, and static if dlopen() is not available -default_shared_modules=vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia +default_shared_modules=vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly if test x$developer = xyes; then default_static_modules=$default_static_modules rpc_rpcecho pdb_ads @@ -6500,6 +6500,7 @@ SMB_MODULE(vfs_smb_traffic_analyzer, \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ), bin/smb_ SMB_MODULE(vfs_onefs, \$(VFS_ONEFS), bin/onefs.$SHLIBEXT, VFS) SMB_MODULE(vfs_onefs_shadow_copy, \$(VFS_ONEFS_SHADOW_COPY), bin/onefs_shadow_copy.$SHLIBEXT, VFS) SMB_MODULE(vfs_dirsort, \$(VFS_DIRSORT_OBJ), bin/dirsort.$SHLIBEXT, VFS) +SMB_MODULE(vfs_scannedonly, \$(VFS_SCANNEDONLY_OBJ), bin/scannedonly.$SHLIBEXT, VFS)
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 91a5970... s3-lanman: Allow a level2 descriptor for a level1 NetShareGetInfo from af2a075... Part 4 of bug #7028 - include scannedonly VFS module http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 91a59704421d2c0a3c23cb936323fc1f9ba17dc0 Author: Giovanni Bajo ra...@develer.com Date: Mon Jan 11 22:18:40 2010 +0100 s3-lanman: Allow a level2 descriptor for a level1 NetShareGetInfo Windows seems to allow this http://lists.samba.org/archive/samba-technical/2009-November/068116.html has a dump of this. (cherry picked from commit d75d14f8de0b1fe36028e605c9453631d9cd70bc) Fix bug #7029 (NetShareEnum: disable sanity check for better compatibility with Windows). --- Summary of changes: source3/smbd/lanman.c |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 7ee6c9b..95b21c9 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -1569,7 +1569,9 @@ static bool check_share_info(int uLevel, char* id) } break; case 1: - if (strcmp(id,B13BWz) != 0) { + /* Level-2 descriptor is allowed (and ignored) */ + if (strcmp(id,B13BWz) != 0 + strcmp(id,B13BWzWWWzB9B) != 0) { return False; } break; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via d1f6739... Fix bug #7036 - net rpc getsid fails in hardened windows environments. from 91a5970... s3-lanman: Allow a level2 descriptor for a level1 NetShareGetInfo http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit d1f67394ce70342a35fba280e533c76bc9775f9d Author: Jeremy Allison j...@samba.org Date: Thu Jan 14 15:39:30 2010 -0800 Fix bug #7036 - net rpc getsid fails in hardened windows environments. Fix suggested by dave.daughe...@centrify.com. (cherry picked from commit 6653cc43233381a941cdd85550f04b087fe880ff) --- Summary of changes: source3/utils/net_rpc.c |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 5b3b1e3..b9e2e55 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -607,6 +607,12 @@ static NTSTATUS rpc_getsid_internals(struct net_context *c, int net_rpc_getsid(struct net_context *c, int argc, const char **argv) { + int conn_flags = NET_FLAGS_PDC; + + if (!c-opt_user_specified) { + conn_flags |= NET_FLAGS_ANONYMOUS; + } + if (c-display_usage) { d_printf(_(Usage:\n net rpc getsid\n @@ -615,7 +621,7 @@ int net_rpc_getsid(struct net_context *c, int argc, const char **argv) } return run_rpc_command(c, NULL, ndr_table_samr.syntax_id, - NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, + conn_flags, rpc_getsid_internals, argc, argv); } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via 59b4663... Fix bug #7036 - net rpc getsid fails in hardened windows environments. from 62bed0d... Fix bug #7034 - vfs_cap causes signal 11 (SIGSEGV) (cherry picked from commit ca847952054f5bbde1d40ad4260589b6fcc9721d) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 59b46630ac205bdfe409c0c8b60dc5f5ddad5cf1 Author: Jeremy Allison j...@samba.org Date: Thu Jan 14 15:39:30 2010 -0800 Fix bug #7036 - net rpc getsid fails in hardened windows environments. Fix suggested by dave.daughe...@centrify.com. (cherry picked from commit 6653cc43233381a941cdd85550f04b087fe880ff) --- Summary of changes: source3/utils/net_rpc.c |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 59dbf9f..75726b0 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -586,6 +586,12 @@ static NTSTATUS rpc_getsid_internals(struct net_context *c, int net_rpc_getsid(struct net_context *c, int argc, const char **argv) { + int conn_flags = NET_FLAGS_PDC; + + if (!c-opt_user_specified) { + conn_flags |= NET_FLAGS_ANONYMOUS; + } + if (c-display_usage) { d_printf(Usage:\n net rpc getsid\n @@ -594,7 +600,7 @@ int net_rpc_getsid(struct net_context *c, int argc, const char **argv) } return run_rpc_command(c, NULL, ndr_table_samr.syntax_id, - NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, + conn_flags, rpc_getsid_internals, argc, argv); } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated
The branch, v3-3-test has been updated via a92d42c... Fix bug #7036 - net rpc getsid fails in hardened windows environments. from f3ed684... WHATSNEW: Update release notes. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit a92d42cf8ae37fe579061f762af601dc49ed71af Author: Jeremy Allison j...@samba.org Date: Thu Jan 14 15:50:02 2010 -0800 Fix bug #7036 - net rpc getsid fails in hardened windows environments. Fix suggested by dave.daughe...@centrify.com. --- Summary of changes: source/utils/net_rpc.c |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c index 826b6d9..b73f98f 100644 --- a/source/utils/net_rpc.c +++ b/source/utils/net_rpc.c @@ -587,6 +587,12 @@ static NTSTATUS rpc_getsid_internals(struct net_context *c, int net_rpc_getsid(struct net_context *c, int argc, const char **argv) { + int conn_flags = NET_FLAGS_PDC; + + if (!c-opt_user_specified) { + conn_flags |= NET_FLAGS_ANONYMOUS; + } + if (c-display_usage) { d_printf(Usage:\n net rpc getsid\n @@ -595,7 +601,7 @@ int net_rpc_getsid(struct net_context *c, int argc, const char **argv) } return run_rpc_command(c, NULL, ndr_table_samr.syntax_id, - NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, + conn_flags, rpc_getsid_internals, argc, argv); } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 73df1d5... docs: fix xml tag in the pdbedit manpage via 2812d75... s3-docs: mention -K option in pdbedit manpage. from d1f6739... Fix bug #7036 - net rpc getsid fails in hardened windows environments. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 73df1d5e6a6eb09df5392656bd9ad5b94a3933a2 Author: Michael Adam ob...@samba.org Date: Tue Jan 12 12:29:14 2010 +0100 docs: fix xml tag in the pdbedit manpage Michael (cherry picked from commit 3b58b2ac39a91c0c9f074abf079f700c7e886841) Signed-off-by: Michael Adam ob...@samba.org Fix bug #7041. commit 2812d7547b87d60509a30e2955acc78084ed7466 Author: Günther Deschner g...@samba.org Date: Fri Jan 8 10:38:46 2010 +0100 s3-docs: mention -K option in pdbedit manpage. Guenther (cherry picked from commit 9bdd3d6c1b1aec536d87fb2e2d4e8495b3c88ee6) Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: docs-xml/manpages-3/pdbedit.8.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml index eaafb97..d139ff5 100644 --- a/docs-xml/manpages-3/pdbedit.8.xml +++ b/docs-xml/manpages-3/pdbedit.8.xml @@ -32,6 +32,7 @@ arg choice=opt-h homedir/arg arg choice=opt-i passdb-backend/arg arg choice=opt-I domain/arg + arg choice=opt-K/arg arg choice=opt-L /arg arg choice=opt-m/arg arg choice=opt-M SID|RID/arg -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via 918045b... docs: add -K option to the pdbedit manpage. from 59b4663... Fix bug #7036 - net rpc getsid fails in hardened windows environments. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 918045b22b1607acf51c40d8c8765862f3400a1d Author: Michael Adam ob...@samba.org Date: Tue Jan 12 08:39:36 2010 +0100 docs: add -K option to the pdbedit manpage. Thanks to Oota Toshiya t-oota at dh.jp.nec.com for pointing this out! Michael Fix bug #7041. --- Summary of changes: docs-xml/manpages-3/pdbedit.8.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml index 9242d67..f6b5d2e 100644 --- a/docs-xml/manpages-3/pdbedit.8.xml +++ b/docs-xml/manpages-3/pdbedit.8.xml @@ -28,6 +28,7 @@ arg choice=opt-D drive/arg arg choice=opt-S script/arg arg choice=opt-p profile/arg + arg choice=opt-K/arg arg choice=opt-a/arg arg choice=opt-t, --password-from-stdin/arg arg choice=opt-m/arg -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 19c78aa... s3-libsmbclient: Fix crash bug in SMBC_parse_path(). from 73df1d5... docs: fix xml tag in the pdbedit manpage http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 19c78aa6d5462a6e91f7d65d52c2f4378d80eecc Author: Günther Deschner g...@samba.org Date: Thu Jan 14 19:34:26 2010 +0100 s3-libsmbclient: Fix crash bug in SMBC_parse_path(). Patch from Tim Waugh twa...@redhat.com. This resolves https://bugzilla.redhat.com/show_bug.cgi?id=552658 LIBSMBCLIENT-OPENDIR torture test checks this as well. Guenther (cherry picked from commit e635b0074c55e0376495abe940355aa7b04f0b70) Fix bug #7043 (SIGSEGV in SMBC_parse_path). --- Summary of changes: source3/libsmb/libsmb_path.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/libsmb_path.c b/source3/libsmb/libsmb_path.c index 6a59a12..511d54e 100644 --- a/source3/libsmb/libsmb_path.c +++ b/source3/libsmb/libsmb_path.c @@ -308,7 +308,7 @@ SMBC_parse_path(TALLOC_CTX *ctx, if (!*pp_server) { return -1; } - *pp_server[wl] = '\0'; + (*pp_server)[wl] = '\0'; return 0; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via 0100941... s3-libsmbclient: Fix crash bug in SMBC_parse_path(). from 918045b... docs: add -K option to the pdbedit manpage. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 01009416998219a27268211a3ae26d7b3ab157f8 Author: Günther Deschner g...@samba.org Date: Thu Jan 14 19:34:26 2010 +0100 s3-libsmbclient: Fix crash bug in SMBC_parse_path(). Patch from Tim Waugh twa...@redhat.com. This resolves https://bugzilla.redhat.com/show_bug.cgi?id=552658 LIBSMBCLIENT-OPENDIR torture test checks this as well. Guenther (cherry picked from commit e635b0074c55e0376495abe940355aa7b04f0b70) Fix bug #7043 (SIGSEGV in SMBC_parse_path). --- Summary of changes: source3/libsmb/libsmb_path.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/libsmb_path.c b/source3/libsmb/libsmb_path.c index 6a59a12..511d54e 100644 --- a/source3/libsmb/libsmb_path.c +++ b/source3/libsmb/libsmb_path.c @@ -308,7 +308,7 @@ SMBC_parse_path(TALLOC_CTX *ctx, if (!*pp_server) { return -1; } - *pp_server[wl] = '\0'; + (*pp_server)[wl] = '\0'; return 0; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated
The branch, v3-3-test has been updated via 0726390... s3-libsmbclient: Fix crash bug in SMBC_parse_path(). from a92d42c... Fix bug #7036 - net rpc getsid fails in hardened windows environments. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 07263901632bb98851d86dc0ba1d2dc22735c020 Author: Günther Deschner g...@samba.org Date: Thu Jan 14 11:34:04 2010 -0800 s3-libsmbclient: Fix crash bug in SMBC_parse_path(). Patch from Tim Waugh twa...@redhat.com. This resolves https://bugzilla.redhat.com/show_bug.cgi?id=552658 LIBSMBCLIENT-OPENDIR torture test checks this as well. Guenther Fix bug #7043 (SIGSEGV in SMBC_parse_path). --- Summary of changes: source/libsmb/libsmb_path.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libsmb/libsmb_path.c b/source/libsmb/libsmb_path.c index 3ea0344..0a54db4 100644 --- a/source/libsmb/libsmb_path.c +++ b/source/libsmb/libsmb_path.c @@ -308,7 +308,7 @@ SMBC_parse_path(TALLOC_CTX *ctx, if (!*pp_server) { return -1; } - *pp_server[wl] = '\0'; + (*pp_server)[wl] = '\0'; return 0; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via b8ff43e... WHATSNEW: Update changes since 3.4.4. from 0100941... s3-libsmbclient: Fix crash bug in SMBC_parse_path(). http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit b8ff43eedef4315595e6b4c4467e8e2d8d19ffc4 Author: Karolin Seeger ksee...@samba.org Date: Fri Jan 15 15:26:20 2010 +0100 WHATSNEW: Update changes since 3.4.4. Karolin --- Summary of changes: WHATSNEW.txt | 23 +-- 1 files changed, 21 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 5c2d63a..8f1fab4 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ = Release Notes for Samba 3.4.5 -January , 2010 +January 19, 2010 = @@ -8,7 +8,8 @@ This is the latest stable release of Samba 3.4. Major enhancements in Samba 3.4.5 include: - o + o Fix memory in leak in smbd (bug #7020). + o Fix changing of ACLs on writable files with dos filemode=yes (bug #5202). ## @@ -19,6 +20,24 @@ Changes since 3.4.4 --- +o Jeremy Allison j...@samba.org +* BUG 5202: Fix changing of ACLs on writable files with dos filemode=yes. +* BUG 7020: Fix memory leak in smbd. +* BUG 7036: Fix 'net rpc getsid' in hardened Windows environments. + + +o Günther Deschner g...@samba.org +* BUG 7043: Fix SIGSEGV in SMBC_parse_path. + + +o Stefan Metzmacher me...@samba.org +* BUG 6642: Fix opening the quota magic file. +* BUG 6919: Fix remote quota management. + + +o SASAJIMA Toshihiro sasajim...@jp.fujitsu.com +* BUG 7034: Fix internal error caused by vfs_cap. + ## Reporting bugs Development Discussion -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 54b98a3... WHATSNEW: Start 3.5.0rc2 release notes. via fa12a98... VERSION: Raise version number up to 3.5.0rc2. from 19c78aa... s3-libsmbclient: Fix crash bug in SMBC_parse_path(). http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 54b98a39dcd6937203dffef3a5cd432a862737ca Author: Karolin Seeger ksee...@samba.org Date: Fri Jan 15 15:56:38 2010 +0100 WHATSNEW: Start 3.5.0rc2 release notes. Karolin commit fa12a98dfdf336a4ee2f653fa0cffb4a4b1ccfe9 Author: Karolin Seeger ksee...@samba.org Date: Fri Jan 15 15:30:06 2010 +0100 VERSION: Raise version number up to 3.5.0rc2. Karolin --- Summary of changes: WHATSNEW.txt| 23 --- source3/VERSION |2 +- 2 files changed, 21 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 26205e5..e7fe91a 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,9 +1,9 @@ - Release Notes for Samba 3.5.0rc1 - January 7, 2010 + Release Notes for Samba 3.5.0rc2 + January 26, 2010 -This is the first release candidate of Samba 3.5. This is *not* +This is the second release candidate of Samba 3.5. This is *not* intended for production environments and is designed for testing purposes only. Please report any defects via the Samba bug reporting system at https://bugzilla.samba.org/. @@ -23,6 +23,9 @@ Winbind changes: o Major refactoring o Asynchronous +VFS modules: +o New vfs_scannedonly module has been added. + General changes: @@ -51,6 +54,13 @@ Winbind changes The Winbind daemon has been refactored internally to be asynchronous. The new Winbind will not be blocked by running 'wbinfo -g' or 'wbinfo -u'. +VFS modules +=== + +A new VFS module scannedonly has been added. This is a filter that +talks to an antivirus-engine and stores whether a file is clean or not. +Users do only see clean files on their filesystem. + ## Changes @@ -97,6 +107,13 @@ o Stefan Metzmacher me...@samba.org * Implement the new SMB2 protocol (experimental). +Changes since 3.5.0rc1 +-- + +o Olivier Sessink oliviersess...@gmail.com +* BUG 7028: Add new scannedonly VFS module. + + Changes since 3.5.0pre2 --- diff --git a/source3/VERSION b/source3/VERSION index 57b741e..325c814 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -56,7 +56,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # - 3.0.0rc1 # -SAMBA_VERSION_RC_RELEASE=1 +SAMBA_VERSION_RC_RELEASE=2 # To mark SVN snapshots this should be set to 'yes'# -- Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - 3.2.11-ctdb-69-1-gf957e56
The branch, v3-2-ctdb has been updated via f957e56ae7b041abc15e5fadc3847da6ca80aece (commit) from 7527cfbc73be52e351dbc5579d840972f7532769 (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb - Log - commit f957e56ae7b041abc15e5fadc3847da6ca80aece Author: Tim Prouty tpro...@samba.org Date: Tue Feb 3 23:17:48 2009 -0800 s3 oplocks: Remove oplocks before handling delete on close semantics Unlinking a file while still holding an oplock can cause problems with kernel oplocks. This simply releases the oplock before actually unlinking the file. --- Summary of changes: source/smbd/close.c |9 + 1 files changed, 5 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/close.c b/source/smbd/close.c index 81d25ef..114de2d 100644 --- a/source/smbd/close.c +++ b/source/smbd/close.c @@ -553,6 +553,11 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_ return NT_STATUS_OK; } + /* Remove the oplock before potentially deleting the file. */ + if(fsp-oplock_type) { + release_file_oplock(fsp); + } + /* If this is an old DOS or FCB open and we have multiple opens on the same handle we only have one share mode. Ensure we only remove the share mode on the last close. */ @@ -562,10 +567,6 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_ saved_status3 = close_remove_share_mode(fsp, close_type); } - if(fsp-oplock_type) { - release_file_oplock(fsp); - } - locking_close_file(smbd_messaging_context(), fsp); status = fd_close(fsp); -- SAMBA-CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a56ede9... s4-ldb: cope with bad ptr alignment in ldb_index.c from 5c016ad... s4 selftest: Ignore more winbind test known to fail http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a56ede9027125aa9e70358661b2db1e9f993e939 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 08:58:27 2010 +1100 s4-ldb: cope with bad ptr alignment in ldb_index.c We can't assume that a rec_ptr will come back from a tdb traverse with alignment sufficient for a pointer. --- Summary of changes: source4/lib/ldb/ldb_tdb/ldb_index.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c index 01d0d6c..4b31021 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_index.c +++ b/source4/lib/ldb/ldb_tdb/ldb_index.c @@ -103,12 +103,12 @@ static struct dn_list *ltdb_index_idxptr(struct ldb_module *module, TDB_DATA rec Bad data size for idxptr %u, (unsigned)rec.dsize); return NULL; } - - list = talloc_get_type(*(struct dn_list **)rec.dptr, struct dn_list); + memcpy(list, rec.dptr, sizeof(void *)); + list = talloc_get_type(list, struct dn_list); if (list == NULL) { ldb_asprintf_errstring(ldb_module_get_ctx(module), Bad type '%s' for idxptr, - talloc_get_name(*(struct dn_list **)rec.dptr)); + talloc_get_name(list)); return NULL; } if (check_parent list-dn talloc_parent(list-dn) != list) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2d41b1a... Fix bug 7045 - Bad (non memory copying) interfaces in smbc_set calls. from a56ede9... s4-ldb: cope with bad ptr alignment in ldb_index.c http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2d41b1ab78639abe4ae030ff482573f464564dd7 Author: Jeremy Allison j...@samba.org Date: Fri Jan 15 17:22:35 2010 -0800 Fix bug 7045 - Bad (non memory copying) interfaces in smbc_set calls. In smbc_free_context libsmbclient just called free() on the string options so it assumes the callers have malloced them before setting them via smbc_set calls. Change to corretly malloc/free string options to the library. Jeremy --- Summary of changes: source3/libsmb/libsmb_context.c | 26 +++--- source3/libsmb/libsmb_setget.c |9 ++--- 2 files changed, 25 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index 78c9a55..336172c 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -291,13 +291,8 @@ smbc_free_context(SMBCCTX *context, } /* Things we have to clean up */ -free(smbc_getWorkgroup(context)); smbc_setWorkgroup(context, NULL); - -free(smbc_getNetbiosName(context)); smbc_setNetbiosName(context, NULL); - -free(smbc_getUser(context)); smbc_setUser(context, NULL); DEBUG(3, (Context %p successfully freed\n, context)); @@ -533,7 +528,6 @@ SMBCCTX * smbc_init_context(SMBCCTX *context) { int pid; -char *user = NULL; if (!context) { errno = EBADF; @@ -569,7 +563,7 @@ smbc_init_context(SMBCCTX *context) /* * FIXME: Is this the best way to get the user info? */ -user = getenv(USER); + char *user = getenv(USER); /* walk around as guest if no username can be found */ if (!user) { user = SMB_STRDUP(guest); @@ -583,6 +577,12 @@ smbc_init_context(SMBCCTX *context) } smbc_setUser(context, user); + SAFE_FREE(user); + + if (!smbc_getUser(context)) { +errno = ENOMEM; +return NULL; +} } if (!smbc_getNetbiosName(context)) { @@ -615,6 +615,12 @@ smbc_init_context(SMBCCTX *context) } smbc_setNetbiosName(context, netbios_name); + SAFE_FREE(netbios_name); + +if (!smbc_getNetbiosName(context)) { +errno = ENOMEM; +return NULL; +} } DEBUG(1, (Using netbios name %s.\n, smbc_getNetbiosName(context))); @@ -636,6 +642,12 @@ smbc_init_context(SMBCCTX *context) } smbc_setWorkgroup(context, workgroup); + SAFE_FREE(workgroup); + + if (!smbc_getWorkgroup(context)) { + errno = ENOMEM; + return NULL; + } } DEBUG(1, (Using workgroup %s.\n, smbc_getWorkgroup(context))); diff --git a/source3/libsmb/libsmb_setget.c b/source3/libsmb/libsmb_setget.c index fc3f321..3ef7078 100644 --- a/source3/libsmb/libsmb_setget.c +++ b/source3/libsmb/libsmb_setget.c @@ -39,7 +39,8 @@ smbc_getNetbiosName(SMBCCTX *c) void smbc_setNetbiosName(SMBCCTX *c, char * netbios_name) { -c-netbios_name = netbios_name; + SAFE_FREE(c-netbios_name); + c-netbios_name = SMB_STRDUP(netbios_name); } /** Get the workgroup used for making connections */ @@ -53,7 +54,8 @@ smbc_getWorkgroup(SMBCCTX *c) void smbc_setWorkgroup(SMBCCTX *c, char * workgroup) { -c-workgroup = workgroup; + SAFE_FREE(c-workgroup); + c-workgroup = SMB_STRDUP(workgroup); } /** Get the username used for making connections */ @@ -67,7 +69,8 @@ smbc_getUser(SMBCCTX *c) void smbc_setUser(SMBCCTX *c, char * user) { -c-user = user; + SAFE_FREE(c-user); + c-user = SMB_STRDUP(user); } /** Get the debug level */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f85b6ee... Second part of bug 7045 - Bad (non memory copying) interfaces in smbc_set calls. from 2d41b1a... Fix bug 7045 - Bad (non memory copying) interfaces in smbc_set calls. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f85b6ee90b88c7f7b2a92c8a5f3e2ebe59c1087b Author: Jeremy Allison j...@samba.org Date: Fri Jan 15 17:33:24 2010 -0800 Second part of bug 7045 - Bad (non memory copying) interfaces in smbc_set calls. Protect against SMB_STRDUP of null... Jeremy. --- Summary of changes: source3/libsmb/libsmb_setget.c | 12 +--- 1 files changed, 9 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/libsmb_setget.c b/source3/libsmb/libsmb_setget.c index 3ef7078..791b4cd 100644 --- a/source3/libsmb/libsmb_setget.c +++ b/source3/libsmb/libsmb_setget.c @@ -40,7 +40,9 @@ void smbc_setNetbiosName(SMBCCTX *c, char * netbios_name) { SAFE_FREE(c-netbios_name); - c-netbios_name = SMB_STRDUP(netbios_name); + if (netbios_name) { + c-netbios_name = SMB_STRDUP(netbios_name); + } } /** Get the workgroup used for making connections */ @@ -55,7 +57,9 @@ void smbc_setWorkgroup(SMBCCTX *c, char * workgroup) { SAFE_FREE(c-workgroup); - c-workgroup = SMB_STRDUP(workgroup); + if (workgroup) { + c-workgroup = SMB_STRDUP(workgroup); + } } /** Get the username used for making connections */ @@ -70,7 +74,9 @@ void smbc_setUser(SMBCCTX *c, char * user) { SAFE_FREE(c-user); - c-user = SMB_STRDUP(user); + if (user) { + c-user = SMB_STRDUP(user); + } } /** Get the debug level */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via ee73608... s4-kcc: added DsReplicaGetInfo pending ops call via 84b47d3... s4-provision: added w2k8r2 ldap capabilities via 637d50b... s4-devel: added rebuild_zone.sh via a9808ae... s4-provision: added check-names ignore; to allow for _msdcs A records via 473345f... s4-kcc: added DsReplicaGetInfo CURSORS2 level via 93531a5... s4-idl: in DsReplicaGetInfo unknown2 is actually an enumeration_context via c22973d... s4-kcc: added support for CURSORS info level in DsReplicaGetInfo via 8342d08... s4-dsdb: take advantage of local cursor and sort via db7eba7... s4-dsdb: add our local cursor and sort in dsdb_load_udv_*() via 0bba440... s4-drs: use dsdb_load_udv_v2() in getncchanges code via 09d947f... s4-dsdb: use dsdb_load_udv_v2() in repl task via 4cef742... s4-dsdb: added dsdb_load_udv_v2() and dsdb_load_udv_v1() via 3ff3612... s4-kcc: simplify the ReplicaGetInfo implementation a bit via 900fea3... s4-kcc: squash a warning via 3a9b33b... s4-drs: better debug info when security checks fail via 5efff3a... s4-dsdb: require admin access for DsReplicaGetInfo via 5bfeed8... s4-drs: framework for DsGetReplInfo(), includes the DS_REPL_INFO_NEIGHBORS infoType. via 22d9215... s4-drs: give better debug info on unsupported DRS calls via 48bdf3e... s4-drs: torture test for DsGetReplInfo() (RPC-DSGETINFO test). via 51bf383... s4-dsdb: added isGlobalCatalogReady from f85b6ee... Second part of bug 7045 - Bad (non memory copying) interfaces in smbc_set calls. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ee736083c07e953a5fee944d3e048e2a38f98b30 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 13:40:51 2010 +1100 s4-kcc: added DsReplicaGetInfo pending ops call Just return 0 pending ops for now commit 84b47d33349ff12fa5951f3348db20a05879f614 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 13:20:46 2010 +1100 s4-provision: added w2k8r2 ldap capabilities commit 637d50b5d0eedced7c2cac6b0605a6c52eec2050 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 13:20:24 2010 +1100 s4-devel: added rebuild_zone.sh This rebuilds a DNS zone file, including all DCs from sam.ldb commit a9808ae83da936a2b93c9b8400ad2283a843ab4b Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 13:19:50 2010 +1100 s4-provision: added check-names ignore; to allow for _msdcs A records commit 473345f8003a89a365a80963c24cb90d932c4e31 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 12:10:40 2010 +1100 s4-kcc: added DsReplicaGetInfo CURSORS2 level commit 93531a52f030cad7d4237d7813fa1d73d641b35a Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 12:03:01 2010 +1100 s4-idl: in DsReplicaGetInfo unknown2 is actually an enumeration_context commit c22973d88dbfb46e5c387ff03b7bb66bada7cac3 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 11:49:39 2010 +1100 s4-kcc: added support for CURSORS info level in DsReplicaGetInfo commit 8342d08f5c3ffd02f54c5d5ace9e76cf551acb51 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 11:49:09 2010 +1100 s4-dsdb: take advantage of local cursor and sort in getncchanges and repl task we don't need the extra load and sort any more. commit db7eba7080e3f60da6751d638a31eaf3e36c9b12 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 11:48:25 2010 +1100 s4-dsdb: add our local cursor and sort in dsdb_load_udv_*() This makes things much simpler for the callers commit 0bba44094af9a1d88e0c2443d382993f1ebfb91e Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 11:08:59 2010 +1100 s4-drs: use dsdb_load_udv_v2() in getncchanges code commit 09d947f77cda4eb62c21cfd7acd539b8fe305a6a Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 11:08:44 2010 +1100 s4-dsdb: use dsdb_load_udv_v2() in repl task commit 4cef7427ec22df1a5c16a22820952f2f963dc1e3 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 11:08:15 2010 +1100 s4-dsdb: added dsdb_load_udv_v2() and dsdb_load_udv_v1() commit 3ff3612e29c16d7f3d87e06e6327d6b5bf530e2c Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 10:37:26 2010 +1100 s4-kcc: simplify the ReplicaGetInfo implementation a bit commit 900fea322cabaa279e016508c688107415ed0796 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 10:36:56 2010 +1100 s4-kcc: squash a warning commit 3a9b33b4876349165e7e16777fa283b128d525be Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 10:36:40 2010 +1100 s4-drs: better debug info when security checks fail show the security token of the user at debug level 2 commit 5efff3ad6a7fdfe71101b2debe7d79678432c5c4 Author: Andrew Tridgell
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 4e0090c... s4-torture: fixed DsReplicaGetInfo elements from ee73608... s4-kcc: added DsReplicaGetInfo pending ops call http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4e0090c9170525bb0ec50d13d96afddd5eec5313 Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 16 14:44:24 2010 +1100 s4-torture: fixed DsReplicaGetInfo elements --- Summary of changes: source4/torture/rpc/drsuapi.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index 20263fe..0496d62 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -366,10 +366,10 @@ static bool test_DsReplicaGetInfo(struct torture_context *tctx, r.in.req-req2.info_type= array[i].infotype; r.in.req-req2.object_dn= object_dn; ZERO_STRUCT(r.in.req-req2.guid1); - r.in.req-req2.unknown1 = 0; + r.in.req-req2.flags= 0; r.in.req-req2.string1 = NULL; r.in.req-req2.string2 = NULL; - r.in.req-req2.unknown2 = 0; + r.in.req-req2.enumeration_context = 0; break; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 28577aa... Import testtools as well, required for subunit. via b6b46b4... subunit: Import new version. via 2e38cb2... Add README about subunit. via 664b74d... Add script for updating the copy of subunit. via 53d7c4c... Fix permissions - net subcommand modules don't need to be executable. from 4e0090c... s4-torture: fixed DsReplicaGetInfo elements http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 28577aae928847e64a0274b5922e26e1f15d9916 Author: Jelmer Vernooij jel...@samba.org Date: Fri Jan 8 02:09:20 2010 +0100 Import testtools as well, required for subunit. commit b6b46b4978dcaffa0cd9803c43b8a5f1c19e227e Author: Jelmer Vernooij jel...@samba.org Date: Thu Dec 31 18:48:41 2009 +0100 subunit: Import new version. commit 2e38cb2cbb7520b2630ed85c3df2eb678c737fda Author: Jelmer Vernooij jel...@samba.org Date: Thu Dec 31 18:32:17 2009 +0100 Add README about subunit. commit 664b74d3669841059224fdf2fc94b53a36613888 Author: Jelmer Vernooij jel...@samba.org Date: Thu Dec 31 18:31:23 2009 +0100 Add script for updating the copy of subunit. commit 53d7c4c7a27ec351638b35458919c8a267b794db Author: Jelmer Vernooij jel...@samba.org Date: Thu Dec 31 18:17:23 2009 +0100 Fix permissions - net subcommand modules don't need to be executable. --- Summary of changes: lib/subunit/README |7 + lib/subunit/filters/tap2subunit| 26 + lib/subunit/python/iso8601/LICENSE | 20 + lib/subunit/python/iso8601/README | 26 + lib/subunit/python/iso8601/README.subunit |5 + lib/subunit/python/iso8601/setup.py| 58 + lib/subunit/python/iso8601/test_iso8601.py | 111 ++ lib/subunit/python/subunit/__init__.py | 1107 lib/subunit/python/subunit/chunked.py | 164 +++ lib/subunit/python/subunit/details.py | 109 ++ lib/subunit/python/subunit/iso8601.py | 123 +++ lib/subunit/python/subunit/progress_model.py | 106 ++ lib/subunit/python/subunit/run.py | 46 + lib/subunit/python/subunit/test_results.py | 334 ++ lib/subunit/python/subunit/tests/__init__.py | 44 +- lib/subunit/python/subunit/tests/sample-script.py |7 + lib/subunit/python/subunit/tests/test_chunked.py | 127 +++ lib/subunit/python/subunit/tests/test_details.py | 110 ++ .../python/subunit/tests/test_progress_model.py| 118 +++ .../python/subunit/tests/test_subunit_filter.py| 136 +++ .../python/subunit/tests/test_subunit_stats.py | 83 ++ .../python/subunit/tests/test_subunit_tags.py | 68 ++ .../python/subunit/tests/test_tap2subunit.py | 432 .../python/subunit/tests/test_test_protocol.py | 967 +- .../python/subunit/tests/test_test_results.py | 199 lib/subunit/python/testtools/__init__.py | 58 + lib/subunit/python/testtools/content.py| 91 ++ lib/subunit/python/testtools/content_type.py | 30 + lib/subunit/python/testtools/matchers.py | 169 +++ lib/subunit/python/testtools/run.py| 39 + lib/subunit/python/testtools/runtest.py| 142 +++ lib/subunit/python/testtools/testcase.py | 444 .../python/testtools/testresult/__init__.py| 19 + lib/subunit/python/testtools/testresult/doubles.py | 95 ++ lib/subunit/python/testtools/testresult/real.py| 540 ++ lib/subunit/python/testtools/tests/__init__.py | 28 + lib/subunit/python/testtools/tests/helpers.py | 67 ++ lib/subunit/python/testtools/tests/test_content.py | 72 ++ .../python/testtools/tests/test_content_type.py| 34 + .../python/testtools/tests/test_matchers.py| 113 ++ lib/subunit/python/testtools/tests/test_runtest.py | 185 .../python/testtools/tests/test_testresult.py | 807 ++ .../python/testtools/tests/test_testsuite.py | 56 + .../python/testtools/tests/test_testtools.py | 743 + lib/subunit/python/testtools/testsuite.py | 74 ++ lib/subunit/python/testtools/utils.py | 39 + lib/subunit/tap2subunit| 35 - lib/subunit/update.sh | 16 + source4/lib/ldb/tests/python/acl.py|3 +- source4/lib/ldb/tests/python/ldap.py |3 +- source4/lib/ldb/tests/python/ldap_schema.py|3 +- source4/lib/ldb/tests/python/sec_descriptor.py |3 +- source4/scripting/bin/subunitrun |3 +- source4/scripting/python/config.mk |2 +- source4/selftest/tests.sh
Build status as of Sat Jan 16 07:00:04 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-01-15 00:00:06.0 -0700 +++ /home/build/master/cache/broken_results.txt 2010-01-16 00:00:51.0 -0700 @@ -1,4 +1,4 @@ -Build status as of Fri Jan 15 07:00:05 2010 +Build status as of Sat Jan 16 07:00:04 2010 Build counts: Tree Total Broken Panic @@ -15,8 +15,8 @@ samba-web0 0 0 samba_3_current 28 28 2 samba_3_master 28 27 5 -samba_3_next 28 27 5 -samba_4_0_test 30 29 1 -talloc 2 0 0 -tdb 2 0 0 +samba_3_next 28 27 6 +samba_4_0_test 30 29 0 +talloc 1 0 0 +tdb 1 0 0
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2ec5792... subunit/testtools: Include newer version. from 28577aa... Import testtools as well, required for subunit. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2ec5792a4ba0cefa079a6d7e1b0ec2472151e794 Author: Jelmer Vernooij jel...@samba.org Date: Sat Jan 16 19:56:21 2010 +1300 subunit/testtools: Include newer version. --- Summary of changes: lib/subunit/python/subunit/__init__.py | 17 - lib/subunit/python/subunit/run.py |5 +- .../python/subunit/tests/test_test_protocol.py |4 + lib/subunit/python/testtools/content.py|2 +- lib/subunit/python/testtools/content_type.py |2 +- lib/subunit/python/testtools/matchers.py | 82 lib/subunit/python/testtools/testcase.py | 50 +--- lib/subunit/python/testtools/tests/__init__.py |2 + .../python/testtools/tests/test_matchers.py| 45 +++ .../python/testtools/tests/test_testtools.py | 16 - lib/subunit/python/testtools/utils.py |2 +- 11 files changed, 205 insertions(+), 22 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/subunit/python/subunit/__init__.py b/lib/subunit/python/subunit/__init__.py index 6e8df90..6b65ae4 100644 --- a/lib/subunit/python/subunit/__init__.py +++ b/lib/subunit/python/subunit/__init__.py @@ -213,10 +213,10 @@ class _ParserState(object): def lineReceived(self, line): a line has been received. parts = line.split(None, 1) -if len(parts) == 2: +if len(parts) == 2 and line.startswith(parts[0]): cmd, rest = parts offset = len(cmd) + 1 -cmd = cmd.strip(':') +cmd = cmd.rstrip(':') if cmd in ('test', 'testing'): self.startTest(offset, line) elif cmd == 'error': @@ -,3 +,16 @@ class TestResultStats(unittest.TestResult): def wasSuccessful(self): Tells whether or not this result was a success return self.failed_tests == 0 + + +def get_default_formatter(): +Obtain the default formatter to write to. + +:return: A file-like object. + +formatter = os.getenv(SUBUNIT_FORMATTER) +if formatter: +return os.popen(formatter, w) +else: +return sys.stdout + diff --git a/lib/subunit/python/subunit/run.py b/lib/subunit/python/subunit/run.py index 2b90791..01c0b0e 100755 --- a/lib/subunit/python/subunit/run.py +++ b/lib/subunit/python/subunit/run.py @@ -22,7 +22,7 @@ import sys -from subunit import TestProtocolClient +from subunit import TestProtocolClient, get_default_formatter class SubunitTestRunner(object): @@ -41,6 +41,7 @@ if __name__ == '__main__': from unittest import TestProgram parser = optparse.OptionParser(__doc__) args = parser.parse_args()[1] -runner = SubunitTestRunner() +stream = get_default_formatter() +runner = SubunitTestRunner(stream) program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner) diff --git a/lib/subunit/python/subunit/tests/test_test_protocol.py b/lib/subunit/python/subunit/tests/test_test_protocol.py index 9e9db18..f10380b 100644 --- a/lib/subunit/python/subunit/tests/test_test_protocol.py +++ b/lib/subunit/python/subunit/tests/test_test_protocol.py @@ -124,6 +124,10 @@ class TestTestProtocolServerStartTest(unittest.TestCase): self.assertEqual(self.client._events, [('startTest', subunit.RemotedTestCase(old mcdonald))]) +def test_indented_test_colon_ignored(self): +self.protocol.lineReceived( test: old mcdonald\n) +self.assertEqual([], self.client._events) + def test_start_testing_colon(self): self.protocol.lineReceived(testing: old mcdonald\n) self.assertEqual(self.client._events, diff --git a/lib/subunit/python/testtools/content.py b/lib/subunit/python/testtools/content.py index 00c7823..353e3f0 100644 --- a/lib/subunit/python/testtools/content.py +++ b/lib/subunit/python/testtools/content.py @@ -44,7 +44,7 @@ class Content(object): no charset parameter is present in the MIME type. (This is somewhat arbitrary, but consistent with RFC2617 3.7.1). -:raises: ValueError If the content type is not text/*. +:raises ValueError: If the content type is not text/\*. if self.content_type.type != text: raise ValueError(Not a text type %r % self.content_type) diff --git a/lib/subunit/python/testtools/content_type.py b/lib/subunit/python/testtools/content_type.py index e70fa76..aded81b 100644 --- a/lib/subunit/python/testtools/content_type.py +++ b/lib/subunit/python/testtools/content_type.py @@