[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a65e22c spoolss: cache_key handle allocation failures early
from e8951eb torture: Free the temporary memory context
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a65e22c6bdf32c2bb014a2ed52794590a49dda34
Author: David Disseldorp dd...@samba.org
Date: Wed Apr 15 15:48:06 2015 +0200
spoolss: cache_key handle allocation failures early
On cache_key allocation failure, set_printer_hnd_name() currently
stumbles through the rest of the function, and includes extra logic to
handle a NULL key later on.
Handling the allocation failure early makes sense, and also allows for
the NULL key checks to be removed.
Signed-off-by: David Disseldorp dd...@samba.org
Reviewed-by: Guenther Deschner g...@samba.org
Autobuild-User(master): Günther Deschner g...@samba.org
Autobuild-Date(master): Wed Apr 15 18:55:50 CEST 2015 on sn-devel-104
---
Summary of changes:
source3/rpc_server/spoolss/srv_spoolss_nt.c | 28
1 file changed, 12 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 65a805a..482f711 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -622,18 +622,18 @@ static WERROR set_printer_hnd_name(TALLOC_CTX *mem_ctx,
found = true;
}
+ cache_key = talloc_asprintf(talloc_tos(), PRINTERNAME/%s, aprinter);
+ if (cache_key == NULL) {
+ return WERR_NOMEM;
+ }
+
/*
* With hundreds of printers, the for loop iterating all
* shares can be quite expensive, as it is done on every
* OpenPrinter. The loop maps aprinter to sname, the
* result of which we cache in gencache.
*/
-
- cache_key = talloc_asprintf(talloc_tos(), PRINTERNAME/%s,
- aprinter);
- if ((cache_key != NULL)
- gencache_get(cache_key, talloc_tos(), tmp, NULL)) {
-
+ if (gencache_get(cache_key, talloc_tos(), tmp, NULL)) {
found = (strcmp(tmp, printer_not_found) != 0);
if (!found) {
DEBUG(4, (Printer %s not found\n, aprinter));
@@ -702,20 +702,16 @@ static WERROR set_printer_hnd_name(TALLOC_CTX *mem_ctx,
TALLOC_FREE(info2);
}
- if ( !found ) {
- if (cache_key != NULL) {
- gencache_set(cache_key, printer_not_found,
-time(NULL)+300);
- TALLOC_FREE(cache_key);
- }
+ if (!found) {
+ gencache_set(cache_key, printer_not_found,
+time_mono(NULL) + 300);
+ TALLOC_FREE(cache_key);
DEBUGADD(4,(Printer not found\n));
return WERR_INVALID_PRINTER_NAME;
}
- if (cache_key != NULL) {
- gencache_set(cache_key, sname, time(NULL)+300);
- TALLOC_FREE(cache_key);
- }
+ gencache_set(cache_key, sname, time_mono(NULL) + 300);
+ TALLOC_FREE(cache_key);
DEBUGADD(4,(set_printer_hnd_name: Printer found: %s - %s\n,
aprinter, sname));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-2-test updated
The branch, v4-2-test has been updated via 8acd3c8 VERSION: Bump version up to 4.2.2... via c2633a9 VERSION: Disable git snapshot for the 4.2.1 release. via 172cdbd WHATSNEW: Add release notes for Samba 4.2.1. from be7b660 s3-passdb: Fix 'force user' with winbind default domain https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test - Log - commit 8acd3c86a6ff0302b7a3ac33447fd35d213c2be3 Author: Karolin Seeger ksee...@samba.org Date: Wed Apr 15 19:59:04 2015 +0200 VERSION: Bump version up to 4.2.2... and re-enable git snapshots. Signed-off-by: Karolin Seeger ksee...@samba.org commit c2633a95a88f5f777fc94a25a07f1faa47420fc5 Author: Karolin Seeger ksee...@samba.org Date: Wed Apr 15 19:58:11 2015 +0200 VERSION: Disable git snapshot for the 4.2.1 release. Signed-off-by: Karolin Seeger ksee...@samba.org commit 172cdbd9ce3f95f591f940223f7f0ebddfad8787 Author: Karolin Seeger ksee...@samba.org Date: Tue Apr 14 22:08:05 2015 +0200 WHATSNEW: Add release notes for Samba 4.2.1. Signed-off-by: Karolin Seeger ksee...@samba.org --- Summary of changes: VERSION | 2 +- WHATSNEW.txt | 110 +++ 2 files changed, 111 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/VERSION b/VERSION index 57afe5a..40e9c83 100644 --- a/VERSION +++ b/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=4 SAMBA_VERSION_MINOR=2 -SAMBA_VERSION_RELEASE=1 +SAMBA_VERSION_RELEASE=2 # If a official release has a serious bug # diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 0996044..3f96dcd 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,114 @@ = + Release Notes for Samba 4.2.1 + April 15, 2015 + = + + +This is the latest stable release of Samba 4.2. + + +Changes since 4.2.0: + + +o Michael Adam ob...@samba.org +* BUG 8905: s3:winbind:grent: Don't stop group enumeration when a group has + no gid. +* BUG 10476: build:wafadmin: Fix use of spaces instead of tabs. +* BUG 11143: s3-winbind: Fix cached user group lookup of trusted domains. + + +o Jeremy Allison j...@samba.org +* BUG 10016: s3: lib: ntlmssp: If NTLMSSP_NEGOTIATE_TARGET_INFO isn't set, + cope with servers that don't send the 2 unused fields. +* BUG 10888: s3: client: client use spnego principal = yes code checks + wrong name. +* BUG 11079: s3: lib: libsmbclient: If reusing a server struct, check every + cli-timout miliseconds if it's still valid before use. +* BUG 11173: s3: libcli: smb1: Ensure we correctly finish a tevent req if + the writev fails in the SMB1 case. +* BUG 11175: Fix lots of winbindd zombie processes on Solaris platform. +* BUG 11177: s3: libsmbclient: Add missing talloc stackframe. + + +o Andrew Bartlett abart...@samba.org +* BUG 11135: backupkey: Explicitly link to gnutls and gcrypt. +* BUG 11174: backupkey: Use ndr_pull_struct_blob_all(). + + +o Ralph Boehme s...@samba.org +* BUG 11125: vfs_fruit: Enhance handling of malformed AppleDouble files. + + +o Samuel Cabrero samuelcabr...@kernevil.me +* BUG 9791: Initialize dwFlags field of DNS_RPC_NODE structure. + + +o David Disseldorp dd...@samba.org +* BUG 11169: docs/idmap_rid: Remove deprecated base_rid from example. + + +o Volker Lendecke v...@samba.org +* BUG 10476: waf: Fix the build on openbsd. + + +o Stefan Metzmacher me...@samba.org +* BUG 11144: talloc: Version 2.1.2. +* BUG 11164: s4:auth/gensec_gssapi: Let gensec_gssapi_update() return + NT_STATUS_LOGON_FAILURE for unknown errors. + + +o Matthew Newton matthew-...@newtoncomputing.co.uk +* BUG 11149: Update libwbclient version to 0.12. + + +o Andreas Schneider a...@samba.org +* BUG 11018: spoolss: Retrieve published printer GUID if not in registry. +* BUG 11135: replace: Remove superfluous check for gcrypt header. +* BUG 11180: s4-process_model: Do not close random fds while forking. +* BUG 11185: s3-passdb: Fix 'force user' with winbind default domain. + + +o Christof Schmitt c...@samba.org +* BUG 11153: brlock: Use 0 instead of empty initializer list. + + +o Thomas Schulz sch...@adi.com +* BUG 11092: lib: texpect: Fix the build on Solaris. +* BUG 11140: libcli/auth: Match Declaration of + netlogon_creds_cli_context_tmp with implementation. + + +o Jelmer Vernooij jel...@samba.org +* BUG 11137: Backport subunit changes. + + +### +Reporting bugs Development Discussion
[SCM] Samba Shared Repository - annotated tag samba-4.2.1 created
The annotated tag, samba-4.2.1 has been created at d599884aa62865ede2abe74d90881a84641a2b0d (tag) tagging c2633a95a88f5f777fc94a25a07f1faa47420fc5 (commit) replaces samba-4.2.0 tagged by Karolin Seeger on Wed Apr 15 20:01:33 2015 +0200 - Log - samba: tag release samba-4.2.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iEYEABECAAYFAlUup30ACgkQbzORW2Vot+r4RACfdIpsgwrUndBZjdN7GQhH6I5B 16gAoKaemDhESYctFK6mapEc2HYTe6O3 =k79J -END PGP SIGNATURE- Andreas Schneider (5): printing: rework nt_printer_guid_store to return errors spoolss: retrieve published printer GUID if not in registry replace: Remove superfluous check for gcrypt header. s4-process_model: Do not close random fds while forking. s3-passdb: Fix 'force user' with winbind default domain Andrew Bartlett (4): token_group: Use samba.tests.subunitrun. lib/tls: Fix behaviour of --disable-gnutls and remove link to gcrypt backupkey: Explicitly link to gnutls and gcrypt backupkey: Use ndr_pull_struct_blob_all() Christof Schmitt (1): brlock: Use 0 instead of empty initializer list David Disseldorp (3): printing: split out printer DN and GUID retrieval printing: add nt_printer_guid_retrieve() helper docs/idmap_rid: remove deprecated base_rid from example Jelmer Vernooij (35): Remove unused imports. urgent_replication: Use subunit reporting, remove allow_empty_output. samba3dump: Add subunit-enabled test for samba3dump. filter-subunit: Drop support for allow_empty_output hack. dirsync test: Create and run a single testsuite, should easy migration to regulary Python unit tests. speedtest: Create and run a single testsuite, should easy migration to regulary Python unit tests. dsdb.tests.ldap: Create and run a single testsuite, should easy migration to regulary Python unit tests. dsdb.tests.acl: Create and run a single testsuite, should easy migration to regulary Python unit tests. Fix subunit test suite name. Support using system ldbmodify. filter-subunit: Consistently use spaces rather than tabs. Add bundled copy of 'extras' python module used by newer versions of testtools/subunit. Add convenience class for old-style Samba subunit python tests. subunitrun: Use new samba.tests.subunitrun module. Move option parsing to samba.tests.subunitrun. Move option handling into samba.tests.subunitrun. sec_descriptor test: Simplify, use samba.tests.subunitrun module. credentials test: Use samba.tests.subunitrun. speedtest: Use samba.tests.subunitrun. sites: Use samba.tests.subunitrun. sec_descriptor: Use samba.tests.subunitrun. passwords: Use samba.tests.subunitrun. password lockout: Use samba.tests.subunitrun. ldap_syntaxes: Use samba.tests.subunitrun. deletetest: use samba.tests.subunitrun. ldap: Use samba.tests.subunitrun. Include mimeparse, which is used by subunit/testtools. Use samba.tests.subunitrun in urgent replication test. Use samba.tests.subunitrun in dsdb ldap and ldap_schema tests. sam: Use samba.tests.subunitrun. selftest: Drop support for TESTSUITE-IDLIST, and remove its last user. Re-use add_prefix function. selftest/tests.py: Remove testsuite samba.tests.samdb which does not have any tests. selftest: Add separate command line for listing tests, allowing us of subunit-filter (which doesn't support subunit v2). Be consistent about what functions add $LISTOPT and $LOADLIST to the command-line. Jeremy Allison (11): lib: talloc: Fix bug when calling a destructor. lib: talloc: Allow destructors to reparent the object they're called on. lib: talloc: Test suite for the new destructor reparent logic. s4: lib: auth: If NTLMSSP_NEGOTIATE_TARGET_INFO isn't set, cope with servers that don't send the 2 unused fields. s3: lib: ntlmssp: If NTLMSSP_NEGOTIATE_TARGET_INFO isn't set, cope with servers that don't send the 2 unused fields. s3: libcli: smb1: Ensure we correctly finish a tevent req if the writev fails in the SMB1 case. s3: lib: libsmbclient: If reusing a server struct, check every cli-timout miliseconds if it's still valid before use. docs: Mark 'client use spnego principal' as deprecated and also a bad idea. s3: client - client use spnego principal = yes code checks wrong name. lib: tdb: Use sigaction when testing for robust mutexes. s3: libsmbclient: Add missing talloc stackframe. Karolin Seeger (3): VERSION: Bump version up to 4.2.1... WHATSNEW: Add release notes for Samba 4.2.1. VERSION: Disable git snapshot for the 4.2.1 release. Matthew Newton (8): Make winbind client library thread-safe by adding context Use global context for winbindd_request_response
[SCM] Samba Shared Repository - branch v4-2-stable updated
The branch, v4-2-stable has been updated via c2633a9 VERSION: Disable git snapshot for the 4.2.1 release. via 172cdbd WHATSNEW: Add release notes for Samba 4.2.1. via be7b660 s3-passdb: Fix 'force user' with winbind default domain via 57f54da s4-process_model: Do not close random fds while forking. via fad13d7 s3: libsmbclient: Add missing talloc stackframe. via 100cd28 lib: tdb: Use sigaction when testing for robust mutexes. via 6cab690 s4:auth/gensec_gssapi: let gensec_gssapi_update() return NT_STATUS_LOGON_FAILURE for unknown errors via f4525a5 s3: client - client use spnego principal = yes code checks wrong name. via faaf9af docs: Mark 'client use spnego principal' as deprecated and also a bad idea. via c286a17 vfs_fruit: enhance handling of malformed AppleDouble files via f93f74c s3:winbind:grent: don't stop group enumeration when a group has no gid via 903dfd6 backupkey: Use ndr_pull_struct_blob_all() via 1dca6ee Ensure we always initialise the winbind context via 84782d4 replace: Remove superfluous check for gcrypt header. via b8253f2 backupkey: Explicitly link to gnutls and gcrypt via 2ee70a1 lib/tls: Fix behaviour of --disable-gnutls and remove link to gcrypt via 1f4edb0 s3: lib: libsmbclient: If reusing a server struct, check every cli-timout miliseconds if it's still valid before use. via a5156c6 s3: libcli: smb1: Ensure we correctly finish a tevent req if the writev fails in the SMB1 case. via 6b4a52c s3: lib: ntlmssp: If NTLMSSP_NEGOTIATE_TARGET_INFO isn't set, cope with servers that don't send the 2 unused fields. via 6f262f6 s4: lib: auth: If NTLMSSP_NEGOTIATE_TARGET_INFO isn't set, cope with servers that don't send the 2 unused fields. via e1bf5b7 docs/idmap_rid: remove deprecated base_rid from example via 1346811 libcli/auth: Match Declaration of netlogon_creds_cli_context_tmp with implementation via 7b7602c Update libwbclient version to 0.12 via fe5ac73 Move wbc global variables into global context instead via bb70e50 Add context versions of wbclient functions via b9d75f6 Add wbcContext to wbcRequestResponse via a52f418 Add wbcContext struct, create and free functions via ae434f4 Use global context for winbindd_request_response via 7f787b4 Make winbind client library thread-safe by adding context via f56d56e talloc: version 2.1.2 via 0693e46 talloc: fix _talloc_total_limit_size prototype via f6df1e9 lib: talloc: Test suite for the new destructor reparent logic. via a21e4e2 lib: talloc: Allow destructors to reparent the object they're called on. via 599ca10 lib: talloc: Fix bug when calling a destructor. via bb97c5e s3-winbind: Fix chached user group lookup of trusted domains. via e92a548 Be consistent about what functions add $LISTOPT and $LOADLIST to the command-line. via ebcba7a selftest: Add separate command line for listing tests, allowing us of subunit-filter (which doesn't support subunit v2). via d8aafcd selftest/tests.py: Remove testsuite samba.tests.samdb which does not have any tests. via b953fbd Re-use add_prefix function. via df04a81 selftest: Drop support for TESTSUITE-IDLIST, and remove its last user. via 6bf5d33 sam: Use samba.tests.subunitrun. via f847bb0 Use samba.tests.subunitrun in dsdb ldap and ldap_schema tests. via 84547fa Use samba.tests.subunitrun in urgent replication test. via 502f424 Include mimeparse, which is used by subunit/testtools. via c845ccb ldap: Use samba.tests.subunitrun. via fbf9611 deletetest: use samba.tests.subunitrun. via 6fbfee3 ldap_syntaxes: Use samba.tests.subunitrun. via 2494914 password lockout: Use samba.tests.subunitrun. via 0bd1fde passwords: Use samba.tests.subunitrun. via fb37077 sec_descriptor: Use samba.tests.subunitrun. via 17f62c0 token_group: Use samba.tests.subunitrun. via c42d07e sites: Use samba.tests.subunitrun. via 84d21d8 speedtest: Use samba.tests.subunitrun. via c41dfc5 credentials test: Use samba.tests.subunitrun. via 8f76884 sec_descriptor test: Simplify, use samba.tests.subunitrun module. via 368e50f Move option handling into samba.tests.subunitrun. via 247974b Move option parsing to samba.tests.subunitrun. via 2969bbe subunitrun: Use new samba.tests.subunitrun module. via 4e1e255 Add convenience class for old-style Samba subunit python tests. via 5ef9651 Add bundled copy of 'extras' python module used by newer versions of testtools/subunit. via 48a92dd filter-subunit: Consistently use spaces rather than tabs. via 88b864a Support using system ldbmodify. via daa54fd Fix subunit test suite name. via
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 39fa88e Announce Samba 4.2.1. from 2194adc Add the 2015 User Survey back https://git.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 39fa88e994e5d0244bc61db29aa3ea5fdb126bea Author: Karolin Seeger ksee...@samba.org Date: Wed Apr 15 20:18:58 2015 +0200 Announce Samba 4.2.1. Signed-off-by: Karolin Seeger ksee...@samba.org --- Summary of changes: generated_news/latest_10_bodies.html| 25 generated_news/latest_10_headlines.html | 4 +- generated_news/latest_2_bodies.html | 34 +-- history/header_history.html | 1 + history/samba-4.2.1.html| 100 latest_stable_release.html | 6 +- 6 files changed, 132 insertions(+), 38 deletions(-) create mode 100755 history/samba-4.2.1.html Changeset truncated at 500 lines: diff --git a/generated_news/latest_10_bodies.html b/generated_news/latest_10_bodies.html index 4eefdca..6a1ff04 100644 --- a/generated_news/latest_10_bodies.html +++ b/generated_news/latest_10_bodies.html @@ -1,3 +1,16 @@ + h5a name=4.2.115 April 2015/a/h5 + p class=headlineSamba 4.2.1 Available for Download/p + pThis is the latest stable release of the Samba 4.2 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-4.2.1.tar.gz;downloaded +now/a. A a href=http://samba.org/samba/ftp/patches/patch-4.2.0-4.2.1.diffs.gz; +patch against Samba 4.2.0/a is also available. See +a href=http://samba.org/samba/history/samba-4.2.1.html;the release notes for +more info/a./p + + h5a name=2015-03-06_vmware_lawsuit06 March 2015/a/h5 p class=headlineSamba supports Christoph Hellwig's lawsuit against VMware/p @@ -110,15 +123,3 @@ now/a. A a href=http://samba.org/samba/ftp/patches/patch-4.1.14-4.1.15.diffs patch against Samba 4.1.14/a is also available. See a href=http://samba.org/samba/history/samba-4.1.15.html; the release notes for more info/a./p - - - h5a name=4.2.0rc320 December 2014/a/h5 - p class=headlineSamba 4.2.0rc3 Available for Download/p - pThis is the third release candidate of the upcoming Samba 4.2 release - series./p - -pThe uncompressed tarballs and patch files have been signed -using GnuPG (ID 6568B7EA). The source code can be -a href=https://download.samba.org/pub/samba/rc/samba-4.2.0rc3.tar.gz;downloaded -now/a. See a href=https://download.samba.org/pub/samba/rc/WHATSNEW-4.2.0rc3.txt; -the release notes for more info/a./p diff --git a/generated_news/latest_10_headlines.html b/generated_news/latest_10_headlines.html index 39973b9..1e2208b 100644 --- a/generated_news/latest_10_headlines.html +++ b/generated_news/latest_10_headlines.html @@ -1,4 +1,6 @@ ul + li 15 April 2015 a href=#4.2.1Samba 4.2.1 Available for Download/a/li + li 06 March 2015 a href=#2015-03-06_vmware_lawsuitSamba - VMware lawsuit to defend the GPL/a/li li 04 March 2015 a href=#4.2.0Samba 4.2.0 Available for Download/a/li @@ -21,6 +23,4 @@ Releases Available for Download (CVE-2014-8143)/a/li li 12 January 2015 a href=#4.1.15Samba 4.1.15 Available for Download/a/li - - li 20 December 2014 a href=#4.2.0rc3Samba 4.2.0rc3 Available for Download/a/li /ul diff --git a/generated_news/latest_2_bodies.html b/generated_news/latest_2_bodies.html index f7215e8..0909fec 100644 --- a/generated_news/latest_2_bodies.html +++ b/generated_news/latest_2_bodies.html @@ -1,27 +1,19 @@ - h5a name=2015-03-06_vmware_lawsuit06 March 2015/a/h5 - p class=headlineSamba supports Christoph Hellwig's lawsuit against VMware/p - -pWe support the a href=https://sfconservancy.org/;Software Freedom Conservancy/a's -legal actions in defense of the GPL. Read our full -a href=https://www.samba.org/samba/news/announcements/2015-03-06_vmware_lawsuit.html;lawsuit statement/a./p - - - h5a name=4.2.004 March 2015/a/h5 - p class=headlineSamba 4.2.0 Available for Download/p - pThis is the first stable release of the Samba 4.2 series./p + h5a name=4.2.115 April 2015/a/h5 + p class=headlineSamba 4.2.1 Available for Download/p + pThis is the latest stable release of the Samba 4.2 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-4.2.0.tar.gz;downloaded -now/a. See a href=http://samba.org/samba/history/samba-4.2.0.html; - the release notes for more info/a./p +a href=http://samba.org/samba/ftp/stable/samba-4.2.1.tar.gz;downloaded +now/a. A a href=http://samba.org/samba/ftp/patches/patch-4.2.0-4.2.1.diffs.gz; +patch against Samba 4.2.0/a is
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 07d3ba4 Change the registry subsystem to use uint32_t from uint32.
Also change session.h.
from a65e22c spoolss: cache_key handle allocation failures early
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 07d3ba435a3a8012da0107b6ff12a7d8951c9650
Author: Richard Sharpe rsha...@samba.org
Date: Tue Apr 14 07:50:28 2015 -0700
Change the registry subsystem to use uint32_t from uint32. Also change
session.h.
Signed-off-by: Richard Sharpe rsha...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Thu Apr 16 00:37:28 CEST 2015 on sn-devel-104
---
Summary of changes:
source3/include/registry.h | 8 +-
source3/include/session.h | 2 +-
source3/registry/reg_api.c | 20 ++--
source3/registry/reg_api.h | 10 +-
source3/registry/reg_api_util.c| 4 +-
source3/registry/reg_api_util.h| 4 +-
source3/registry/reg_backend_db.c | 18 ++--
source3/registry/reg_backend_hkpt_params.c | 4 +-
source3/registry/reg_backend_netlogon_params.c | 2 +-
source3/registry/reg_backend_smbconf.c | 4 +-
source3/registry/reg_dispatcher.c | 4 +-
source3/registry/reg_dispatcher.h | 4 +-
source3/registry/reg_parse_prs.c | 30 +++---
source3/registry/reg_parse_prs.h | 22 ++--
source3/registry/reg_perfcount.c | 66 ++--
source3/registry/reg_perfcount.h | 12 +--
source3/registry/regfio.c | 144 -
source3/registry/regfio.h | 92
18 files changed, 225 insertions(+), 225 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/registry.h b/source3/include/registry.h
index f7a537e..0de392f 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -47,8 +47,8 @@ struct registry_ops {
WERROR (*create_subkey)(const char *key, const char *subkey);
WERROR (*delete_subkey)(const char *key, const char *subkey, bool
lazy);
bool(*store_values)( const char *key, struct regval_ctr *val );
- bool(*reg_access_check)( const char *keyname, uint32 requested,
-uint32 *granted,
+ bool(*reg_access_check)( const char *keyname, uint32_t requested,
+uint32_t *granted,
const struct security_token *token );
WERROR (*get_secdesc)(TALLOC_CTX *mem_ctx, const char *key,
struct security_descriptor **psecdesc);
@@ -61,9 +61,9 @@ struct registry_ops {
/* structure to store the registry handles */
struct registry_key_handle {
- uint32 type;
+ uint32_ttype;
char*name; /* full name of registry key */
- uint32 access_granted;
+ uint32_taccess_granted;
struct registry_ops *ops;
};
diff --git a/source3/include/session.h b/source3/include/session.h
index ba96ae3..fe41954 100644
--- a/source3/include/session.h
+++ b/source3/include/session.h
@@ -34,7 +34,7 @@ struct sessionid {
fstring netbios_name;
fstring remote_machine;
fstring id_str;
- uint32 id_num;
+ uint32_t id_num;
struct server_id pid;
fstring ip_addr_str;
time_t connect_start;
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index d1c70ec..586bf03 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -133,7 +133,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
struct registry_key *parent,
const char *name,
const struct security_token *token,
- uint32 access_desired,
+ uint32_t access_desired,
struct registry_key **pregkey)
{
WERROR result = WERR_OK;
@@ -229,7 +229,7 @@ done:
}
WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
- uint32 desired_access,
+ uint32_t desired_access,
const struct security_token *token,
struct registry_key **pkey)
{
@@ -252,7 +252,7 @@ WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
**/
WERROR reg_openkey(TALLOC_CTX *mem_ctx, struct registry_key *parent,
- const char *name, uint32
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4491817 s3: smbd: Make sure we do not pass paths with ./ on the
front to VFS routines.
from 07d3ba4 Change the registry subsystem to use uint32_t from uint32.
Also change session.h.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 449181768f5858587742476ec494af17a7108c34
Author: Richard Sharpe rsha...@samba.org
Date: Wed Apr 15 13:53:09 2015 -0700
s3: smbd: Make sure we do not pass paths with ./ on the front to VFS
routines.
Signed-off-by: Richard Sharpe rsha...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Thu Apr 16 07:30:30 CEST 2015 on sn-devel-104
---
Summary of changes:
source3/smbd/dir.c | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 073ac2f..3cddc4a 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1068,6 +1068,7 @@ bool smbd_dirptr_get_entry(TALLOC_CTX *ctx,
connection_struct *conn = dirptr-conn;
size_t slashlen;
size_t pathlen;
+ bool dirptr_path_is_dot = ISDOT(dirptr-path);
*_smb_fname = NULL;
*_mode = 0;
@@ -1132,10 +1133,18 @@ bool smbd_dirptr_get_entry(TALLOC_CTX *ctx,
return false;
}
- memcpy(pathreal, dirptr-path, pathlen);
- pathreal[pathlen] = '/';
- memcpy(pathreal + slashlen + pathlen, dname,
- talloc_get_size(dname));
+ /*
+* We don't want to pass ./xxx to modules below us so don't
+* add the path if it is just . by itself.
+*/
+ if (dirptr_path_is_dot) {
+ memcpy(pathreal, dname, talloc_get_size(dname));
+ } else {
+ memcpy(pathreal, dirptr-path, pathlen);
+ pathreal[pathlen] = '/';
+ memcpy(pathreal + slashlen + pathlen, dname,
+ talloc_get_size(dname));
+ }
/* Create smb_fname with NULL stream_name. */
smb_fname = (struct smb_filename) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 15db9f6 autobuild: Add options to set mail host and send e-mail
with logs
via bc5a4f5 autobuild: Do not consider IDL.pm and Expr.pm changes to
make a build bad
via 1b0bfdf Improve output of check-clean-tree.sh script
via eeb90cf .gitignore: Ignore pidl/MYMETA.json
via d65675b autobuild: Do not wait when running just one target
from 9d695c7 Fix incorrect order of arguments in error string
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 15db9f6a2e143376db707b0426c5daf1746d144b
Author: Andrew Bartlett abart...@samba.org
Date: Tue Apr 14 17:18:02 2015 +1200
autobuild: Add options to set mail host and send e-mail with logs
This helps when running the script in a cloud instance as
it is cheapest to shut it down once run
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Jelmer Vernooij jel...@samba.org
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Wed Apr 15 08:41:37 CEST 2015 on sn-devel-104
commit bc5a4f5227917e05a8fc4922f9148b7c5a826a2c
Author: Andrew Bartlett abart...@samba.org
Date: Tue Apr 14 12:19:56 2015 +1200
autobuild: Do not consider IDL.pm and Expr.pm changes to make a build bad
This allows a different yapp to be installed on the build host without
failing
the whole autobuild
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Jelmer Vernooij jel...@samba.org
commit 1b0bfdf64f40fd743c8257ebe8f2f82478c95dbb
Author: Andrew Bartlett abart...@samba.org
Date: Tue Apr 14 12:00:36 2015 +1200
Improve output of check-clean-tree.sh script
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Jelmer Vernooij jel...@samba.org
commit eeb90cfea2d5615ec3721387fba560a6663a3aaf
Author: Andrew Bartlett abart...@samba.org
Date: Tue Apr 14 12:03:43 2015 +1200
.gitignore: Ignore pidl/MYMETA.json
This is generated by newer versions of MakeMaker
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Jelmer Vernooij jel...@samba.org
commit d65675b2dfc319fa9991cbae085939000bd06b58
Author: Andrew Bartlett abart...@samba.org
Date: Tue Apr 14 11:59:57 2015 +1200
autobuild: Do not wait when running just one target
This avoids having to remember to specify AUTOBUILD_RANDOM_SLEEP_OVERRIDE
manually
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Jelmer Vernooij jel...@samba.org
---
Summary of changes:
.gitignore | 1 +
script/autobuild.py | 74 +++--
script/clean-source-tree.sh | 4 +--
3 files changed, 54 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index aa51a37..a4c2a69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ pidl/cover_db
pidl/Makefile
pidl/pm_to_blib
pidl/MYMETA.yml
+pidl/MYMETA.json
packaging/RHEL-CTDB/samba.spec
packaging/RHEL/samba.spec
packaging/RHEL/makerpms.sh
diff --git a/script/autobuild.py b/script/autobuild.py
index 6e1e3e0..b2303f7 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -7,8 +7,13 @@ from subprocess import call, check_call,Popen, PIPE
import os, tarfile, sys, time
from optparse import OptionParser
import smtplib
+import email
from email.mime.text import MIMEText
+from email.mime.base import MIMEBase
+from email.mime.application import MIMEApplication
+from email.mime.multipart import MIMEMultipart
from distutils.sysconfig import get_python_lib
+import platform
# This speeds up testing remarkably.
os.environ['TDB_NO_FSYNC'] = '1'
@@ -150,6 +155,7 @@ tasks = {
(make, make, text/plain),
(test, make test, text/plain),
(install, make install, text/plain),
+ (checkout-yapp-generated, git checkout lib/Parse/Pidl/IDL.pm
lib/Parse/Pidl/Expr.pm, text/plain),
(check-clean-tree, ../script/clean-source-tree.sh,
text/plain),
(clean, make clean, text/plain) ],
@@ -230,6 +236,11 @@ class buildlist(object):
self.retry = None
if tasknames == []:
tasknames = defaulttasks
+else:
+# If we are only running one test,
+# do not sleep randomly to wait for it to start
+os.environ['AUTOBUILD_RANDOM_SLEEP_OVERRIDE'] = '1'
+
for n in tasknames:
b = builder(n, tasks[n])
self.tlist.append(b)
@@ -455,6 +466,10 @@ parser.add_option(, --retry, help=automatically retry
if master changes,
default=False, action=store_true)
parser.add_option(, --email, help=send email to the given address on
failure,
type='str', default=None)
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/2015-04-15-1028/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2015-04-15-1028/samba.stderr http://git.samba.org/autobuild.flakey/2015-04-15-1028/samba.stdout The top commit at the time of the failure was: commit 15db9f6a2e143376db707b0426c5daf1746d144b Author: Andrew Bartlett abart...@samba.org Date: Tue Apr 14 17:18:02 2015 +1200 autobuild: Add options to set mail host and send e-mail with logs This helps when running the script in a cloud instance as it is cheapest to shut it down once run Signed-off-by: Andrew Bartlett abart...@samba.org Reviewed-by: Jelmer Vernooij jel...@samba.org Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Wed Apr 15 08:41:37 CEST 2015 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e8951eb torture: Free the temporary memory context via ba6ffdb torture: Correctly invalidate the memory ccache. from 15db9f6 autobuild: Add options to set mail host and send e-mail with logs https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e8951eb9b837c05bd3c53de9368702c5de644ada Author: Andreas Schneider a...@samba.org Date: Tue Apr 14 10:56:53 2015 +0200 torture: Free the temporary memory context Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Michael Adam ob...@samba.org Autobuild-User(master): Andreas Schneider a...@cryptomilk.org Autobuild-Date(master): Wed Apr 15 11:20:22 CEST 2015 on sn-devel-104 commit ba6ffdbbcc954b9c58547eb9505fce75234d593d Author: Andreas Schneider a...@samba.org Date: Mon Apr 13 15:37:58 2015 +0200 torture: Correctly invalidate the memory ccache. Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Michael Adam ob...@samba.org --- Summary of changes: source4/torture/rpc/remote_pac.c | 4 1 file changed, 4 insertions(+) Changeset truncated at 500 lines: diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c index 82d7af9..196d9f8 100644 --- a/source4/torture/rpc/remote_pac.c +++ b/source4/torture/rpc/remote_pac.c @@ -168,6 +168,8 @@ static bool test_PACVerify(struct torture_context *tctx, client_creds = cli_credentials_shallow_copy(tmp_ctx, cmdline_credentials); torture_assert(tctx, client_creds, Failed to copy of credentials); + /* Invalidate the gss creds container to allocate a new MEMORY ccache */ + cli_credentials_invalidate_ccache(client_creds, CRED_SPECIFIED); server_creds = cli_credentials_shallow_copy(tmp_ctx, credentials); @@ -447,6 +449,8 @@ static bool test_PACVerify(struct torture_context *tctx, torture_assert(tctx, netlogon_creds_client_check(creds, r.out.return_authenticator-cred), Credential chaining failed); + talloc_free(tmp_ctx); + return true; } -- Samba Shared Repository
