[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f981257 libcli/smb/smb2_signing: rename smb2_key_deviration - smb2_key_derivation from 65d42ab s3:torture/test_smb2: test path based calls during reauth in SMB2-MULTI-CHANNEL http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f981257240976bbc88251248ad9a7f56277e22a8 Author: Michael Adam ob...@samba.org Date: Wed Feb 29 05:49:49 2012 +0100 libcli/smb/smb2_signing: rename smb2_key_deviration - smb2_key_derivation Autobuild-User: Michael Adam ob...@samba.org Autobuild-Date: Wed Feb 29 09:01:54 CET 2012 on sn-devel-104 --- Summary of changes: libcli/smb/smb2_signing.c |2 +- libcli/smb/smb2_signing.h |2 +- libcli/smb/smbXcli_base.c |6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c index 4204ed1..43c9ba5 100644 --- a/libcli/smb/smb2_signing.c +++ b/libcli/smb/smb2_signing.c @@ -176,7 +176,7 @@ NTSTATUS smb2_signing_check_pdu(DATA_BLOB signing_key, return NT_STATUS_OK; } -void smb2_key_deviration(const uint8_t *KI, size_t KI_len, +void smb2_key_derivation(const uint8_t *KI, size_t KI_len, const uint8_t *Label, size_t Label_len, const uint8_t *Context, size_t Context_len, uint8_t KO[16]) diff --git a/libcli/smb/smb2_signing.h b/libcli/smb/smb2_signing.h index 34d8ba2..200274b 100644 --- a/libcli/smb/smb2_signing.h +++ b/libcli/smb/smb2_signing.h @@ -33,7 +33,7 @@ NTSTATUS smb2_signing_check_pdu(DATA_BLOB signing_key, const struct iovec *vector, int count); -void smb2_key_deviration(const uint8_t *KI, size_t KI_len, +void smb2_key_derivation(const uint8_t *KI, size_t KI_len, const uint8_t *Label, size_t Label_len, const uint8_t *Context, size_t Context_len, uint8_t KO[16]); diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index e64a9c7..bdb6e48 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -4143,7 +4143,7 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session, const DATA_BLOB context = _STRING_BLOB(SmbSign); #undef _STRING_BLOB - smb2_key_deviration(session_key, sizeof(session_key), + smb2_key_derivation(session_key, sizeof(session_key), label.data, label.length, context.data, context.length, session-smb2.signing_key.data); @@ -4162,7 +4162,7 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session, const DATA_BLOB context = _STRING_BLOB(SmbRpc); #undef _STRING_BLOB - smb2_key_deviration(session_key, sizeof(session_key), + smb2_key_derivation(session_key, sizeof(session_key), label.data, label.length, context.data, context.length, session-smb2.application_key.data); @@ -4267,7 +4267,7 @@ NTSTATUS smb2cli_session_set_channel_key(struct smbXcli_session *session, const DATA_BLOB context = _STRING_BLOB(SmbSign); #undef _STRING_BLOB - smb2_key_deviration(channel_key, sizeof(channel_key), + smb2_key_derivation(channel_key, sizeof(channel_key), label.data, label.length, context.data, context.length, session-smb2.channel_signing_key.data); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via cac9bfe testsuite: Replace deprecated bzero with memset from f981257 libcli/smb/smb2_signing: rename smb2_key_deviration - smb2_key_derivation http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit cac9bfe475790c8d682e30fd2648099dc3e72fa5 Author: Amitay Isaacs ami...@gmail.com Date: Wed Feb 29 16:05:53 2012 +1100 testsuite: Replace deprecated bzero with memset This fixes build issues on solaris reported in bug #8767. https://bugzilla.samba.org/show_bug.cgi?id=8767 Autobuild-User: Amitay Isaacs ami...@samba.org Autobuild-Date: Wed Feb 29 10:39:10 CET 2012 on sn-devel-104 --- Summary of changes: testsuite/libsmbclient/src/chmod/chmod_1.c |4 ++-- testsuite/libsmbclient/src/chown/chown_1.c |4 ++-- testsuite/libsmbclient/src/close/close_1.c |4 ++-- testsuite/libsmbclient/src/close/close_2.c |4 ++-- testsuite/libsmbclient/src/closedir/closedir_1.c |4 ++-- testsuite/libsmbclient/src/closedir/closedir_2.c |4 ++-- testsuite/libsmbclient/src/closedir/closedir_3.c |4 ++-- testsuite/libsmbclient/src/closedir/closedir_4.c |4 ++-- testsuite/libsmbclient/src/creat/creat_1.c |4 ++-- testsuite/libsmbclient/src/creat/creat_2.c |4 ++-- testsuite/libsmbclient/src/creat/creat_3.c |4 ++-- testsuite/libsmbclient/src/fstat/fstat_1.c |2 +- testsuite/libsmbclient/src/fstat/fstat_2.c |2 +- testsuite/libsmbclient/src/fstat/fstat_3.c |4 ++-- testsuite/libsmbclient/src/fstat/fstat_4.c |4 ++-- testsuite/libsmbclient/src/fstat/fstat_5.c |4 ++-- testsuite/libsmbclient/src/fstat/fstat_6.c |4 ++-- testsuite/libsmbclient/src/getdents/getdents_1.c |4 ++-- testsuite/libsmbclient/src/getdents/getdents_2.c |4 ++-- testsuite/libsmbclient/src/getdents/getdents_3.c | 14 +++--- testsuite/libsmbclient/src/getdents/getdents_4.c | 10 +- testsuite/libsmbclient/src/getdents/getdents_5.c | 10 +- testsuite/libsmbclient/src/init/init_3.c |4 ++-- .../src/list_print_jobs/list_print_jobs_1.c|8 .../src/list_print_jobs/list_print_jobs_2.c|8 .../src/list_print_jobs/list_print_jobs_3.c|8 .../src/list_print_jobs/list_print_jobs_4.c|8 .../src/list_print_jobs/list_print_jobs_5.c|8 .../src/list_print_jobs/list_print_jobs_6.c|8 .../src/list_print_jobs/list_print_jobs_7.c|8 testsuite/libsmbclient/src/lseek/lseek_1.c |2 +- testsuite/libsmbclient/src/lseek/lseek_2.c |2 +- testsuite/libsmbclient/src/lseek/lseek_3.c |4 ++-- testsuite/libsmbclient/src/lseek/lseek_4.c |4 ++-- testsuite/libsmbclient/src/lseek/lseek_5.c |4 ++-- testsuite/libsmbclient/src/lseek/lseek_6.c |4 ++-- testsuite/libsmbclient/src/lseek/lseek_7.c |4 ++-- testsuite/libsmbclient/src/lseek/lseek_8.c |4 ++-- testsuite/libsmbclient/src/lseekdir/lseekdir_1.c | 10 +- testsuite/libsmbclient/src/lseekdir/lseekdir_2.c | 10 +- testsuite/libsmbclient/src/lseekdir/lseekdir_3.c |4 ++-- testsuite/libsmbclient/src/lseekdir/lseekdir_4.c |4 ++-- testsuite/libsmbclient/src/lseekdir/lseekdir_5.c | 10 +- testsuite/libsmbclient/src/lseekdir/lseekdir_6.c | 10 +- testsuite/libsmbclient/src/mkdir/mkdir_1.c |4 ++-- testsuite/libsmbclient/src/mkdir/mkdir_2.c |4 ++-- testsuite/libsmbclient/src/mkdir/mkdir_3.c |4 ++-- testsuite/libsmbclient/src/mkdir/mkdir_4.c |4 ++-- testsuite/libsmbclient/src/open/open_1.c |4 ++-- testsuite/libsmbclient/src/open/open_2.c |4 ++-- testsuite/libsmbclient/src/open/open_3.c |4 ++-- testsuite/libsmbclient/src/open/open_4.c |4 ++-- testsuite/libsmbclient/src/open/open_5.c |4 ++-- .../src/open_print_job/open_print_job_1.c |4 ++-- .../src/open_print_job/open_print_job_2.c |4 ++-- testsuite/libsmbclient/src/opendir/opendir_1.c |4 ++-- testsuite/libsmbclient/src/opendir/opendir_2.c |4 ++-- testsuite/libsmbclient/src/opendir/opendir_3.c |4 ++-- testsuite/libsmbclient/src/opendir/opendir_4.c |4 ++-- .../libsmbclient/src/print_file/print_file_1.c |4 ++-- .../libsmbclient/src/print_file/print_file_2.c |4 ++-- .../libsmbclient/src/print_file/print_file_3.c |4 ++-- .../libsmbclient/src/print_file/print_file_4.c |4 ++-- testsuite/libsmbclient/src/read/read_1.c
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7cc19af selftest: add more tests for plugin_s4_dc
via 89fb6da selftest: change plugin_dc to test using s3fs
via 265a2bf selftest: skip the troublesome samba4.rpc.unixinfo test
via 692c42c s4:winbind: use ncalrpc for connections to ourself
via 8e8fde5 selftest: Do not run chgdcpass test on the main DC
via 7158728 s4-winbindd: Do not ask for a tree that we will not use
from cac9bfe testsuite: Replace deprecated bzero with memset
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7cc19afb1f739d68da852019ff709248b4dce97c
Author: Andrew Bartlett abart...@samba.org
Date: Wed Feb 29 12:48:21 2012 +1100
selftest: add more tests for plugin_s4_dc
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Wed Feb 29 12:14:05 CET 2012 on sn-devel-104
commit 89fb6da8d074be1f02a9f41d125a407fb44689b0
Author: Andrew Bartlett abart...@samba.org
Date: Fri Sep 9 09:03:23 2011 +1000
selftest: change plugin_dc to test using s3fs
commit 265a2bf04f7d9d5203606c47997f4c0c3a9ead5f
Author: Andrew Bartlett abart...@samba.org
Date: Wed Feb 29 10:06:31 2012 +1100
selftest: skip the troublesome samba4.rpc.unixinfo test
The issue here is that while the single rpc_server process is stuck in
an nss_winbind getpwuid() call, winbindd cannot contact netlogon to
make the connection to the domain.
nss_winbind comes into play when (for s3fs) the
NSS_WRAPPER_WINBIND_SO_PATH environment variable is set. In the
medium term, the unixinfo pipe should either be rewritten fully async
or removed.
Andrew Bartlett
commit 692c42c42731b017310e07549489c3ab0bca7d12
Author: Stefan Metzmacher me...@samba.org
Date: Fri Feb 24 15:58:40 2012 +0100
s4:winbind: use ncalrpc for connections to ourself
That avoids recursion if smbd is used as file server.
metze
commit 8e8fde51b4234b75a5b132e7ea7d9c813fe29ee0
Author: Andrew Bartlett abart...@samba.org
Date: Wed Feb 29 12:48:21 2012 +1100
selftest: Do not run chgdcpass test on the main DC
If winbindd has it's password changed from under it, it becomes
grumpy.
Andrew Bartlett
commit 71587285ccf78547ee4830b03d8a1493412504a5
Author: Andrew Bartlett abart...@samba.org
Date: Wed Feb 29 10:37:40 2012 +1100
s4-winbindd: Do not ask for a tree that we will not use
---
Summary of changes:
selftest/skip |2 +
selftest/target/Samba3.pm | 73
selftest/target/Samba4.pm | 61 ---
source4/selftest/tests.py |6 +-
source4/winbind/wb_cmd_list_trustdom.c |4 --
source4/winbind/wb_dom_info.c | 20 +
source4/winbind/wb_init_domain.c | 25 ---
7 files changed, 98 insertions(+), 93 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/skip b/selftest/skip
index f9bb83a..0630512 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -100,3 +100,5 @@ bench # don't run benchmarks in our selftest
^samba4.drs.repl_schema.python # flakey test
^samba4.smb2.ioctl # snapshots not supported by default
^samba4.drs.delete_object.python # flakey test
+^samba4.rpc.unixinfo # This contains a server-side getpwuid call which hangs
the server when nss_winbindd is in use
+^samba.tests.dcerpc.unix # This contains a server-side getpwuid call which
hangs the server when nss_winbindd is in use
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 4b0b725..9d74e7d 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -295,79 +295,6 @@ sub setup_admember()
return $ret;
}
-sub setup_plugin_s4_dc()
-{
- my ($self, $prefix, $dcvars, $iface) = @_;
-
- print PROVISIONING S4 PLUGIN AD DC$iface...;
-
- my $plugin_s4_dc_options =
-workgroup = $dcvars-{DOMAIN}
-realm = $dcvars-{REALM}
-
-security = ads
-domain logons = yes
-passdb backend = samba4
-auth methods = guest samba4
-server signing = on
-
-rpc_server:epmapper = disabled
-rpc_server:rpcecho = disabled
-rpc_server:dssetup = disabled
-rpc_server:svctl = disabled
-rpc_server:ntsvcs = disabled
-rpc_server:eventlog = disabled
-rpc_server:initshutdown = disabled
-
-rpc_server:winreg = embedded
-rpc_server:srvsvc = embedded
-rpc_server:netdfs = embedded
-rpc_server:wkssvc = embedded
-rpc_server:spoolss = embedded
-
-rpc_server:lsarpc = external
-rpc_server:netlogon = external
-rpc_server:samr = external
-
-rpc_daemon:epmd = disabled
-rpc_daemon:lsasd = disabled
-
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 8e141d6 s3-winbindd: Close netlogon connection if the status
returned by the NetrSamLogonEx call is timeout in the pam_auth_crap path
from 6c1501a s3-winbindd: set the can_do_validation6 also for trusted
domain
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 8e141d666c3fc835001249753b6ea9b508256d73
Author: Matthieu Patou m...@matws.net
Date: Fri Feb 24 14:06:02 2012 -0800
s3-winbindd: Close netlogon connection if the status returned by the
NetrSamLogonEx call is timeout in the pam_auth_crap path
If not the child process would hang for quite a long time up to the
moment when the connection is cleaned by the kernel (took ~ 20 minutes)
in my tests.
Fix bug #8771 (Winbind takes up to 20 minutes to change from DC 1 to DC 2
and
in the meantime to respond NT_STATUS_IO_TIMEOUT).
---
Summary of changes:
source3/winbindd/winbindd_pam.c |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 5c56b87..26fdc5a 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -2101,6 +2101,15 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct
winbindd_domain *domain,
done:
+ if (NT_STATUS_EQUAL(result, NT_STATUS_IO_TIMEOUT)) {
+ DEBUG(3,(winbindd_dual_pam_auth_crap: sam_network_logon(ex)
+ returned NT_STATUS_IO_TIMEOUT after the retry.
+ We didn't know what's going on killing
+ connections to domain %s\n,
+ name_domain));
+ invalidate_cm_connection(contact_domain-conn);
+ }
+
/* give us a more useful (more correct?) error code */
if ((NT_STATUS_EQUAL(result, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND) ||
(NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 5278f1c Fix problem reported by Tom Lee tlee2...@gmail.com - when
calculating the share security mask, take priviliges into account for the
connecting user.
from 01747a5 s3-winbindd: set the can_do_validation6 also for trusted
domain
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 5278f1c89191ae56ffe68feac4eb019fbc8336bc
Author: Jeremy Allison j...@samba.org
Date: Tue Feb 28 09:47:50 2012 -0800
Fix problem reported by Tom Lee tlee2...@gmail.com - when calculating the
share security mask, take priviliges into account for the connecting user.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Tue Feb 28 20:21:26 CET 2012 on sn-devel-104
(cherry picked from commit 6081fabe7e0f461ea7d288c40727d4fb5defce5d)
Fix bug #8784 (Open file with SEC_FLAG_SYSTEM_SECURITY mask requested is
blocked
by share security mask.)
---
Summary of changes:
source3/smbd/service.c | 31 ---
1 files changed, 28 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 34b24f3..f57e57f 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -732,6 +732,33 @@ NTSTATUS set_conn_force_user_group(connection_struct
*conn, int snum)
}
/
+ Setup the share access mask for a connection.
+/
+
+static void create_share_access_mask(connection_struct *conn, int snum)
+{
+ const struct security_token *token = conn-session_info-security_token;
+
+ share_access_check(token,
+ lp_servicename(snum),
+ MAXIMUM_ALLOWED_ACCESS,
+ conn-share_access);
+
+ if (security_token_has_privilege(token, SEC_PRIV_SECURITY)) {
+ conn-share_access |= SEC_FLAG_SYSTEM_SECURITY;
+ }
+ if (security_token_has_privilege(token, SEC_PRIV_RESTORE)) {
+ conn-share_access |= (SEC_RIGHTS_PRIV_RESTORE);
+ }
+ if (security_token_has_privilege(token, SEC_PRIV_BACKUP)) {
+ conn-share_access |= (SEC_RIGHTS_PRIV_BACKUP);
+ }
+ if (security_token_has_privilege(token, SEC_PRIV_TAKE_OWNERSHIP)) {
+ conn-share_access |= (SEC_STD_WRITE_OWNER);
+ }
+}
+
+/
Make a connection, given the snum to connect to, and the vuser of the
connecting user if appropriate.
/
@@ -845,9 +872,7 @@ static connection_struct *make_connection_snum(struct
smbd_server_connection *sc
*
*/
- share_access_check(conn-session_info-security_token,
- lp_servicename(snum), MAXIMUM_ALLOWED_ACCESS,
- conn-share_access);
+ create_share_access_mask(conn, snum);
if ((conn-share_access FILE_WRITE_DATA) == 0) {
if ((conn-share_access FILE_READ_DATA) == 0) {
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.12-225-g05e75de
The branch, master has been updated
via 05e75dea9eaa0decc2909e0c2cf1715c81374200 (commit)
from 7417d994c2a159f71d27d4bcd2f53684862eece3 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 05e75dea9eaa0decc2909e0c2cf1715c81374200
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Thu Mar 1 12:36:03 2012 +1100
New version 1.13
This will be the new long term stable branch for ctdb
Main new features are
read-only records: performance/scaling improvement for concurrent access to
the same record from multiple nodes.
fetch-lock-collapse: performance/scaling improvement for concurrent write
access to the same record from multiple nodes.
---
Summary of changes:
packaging/RPM/ctdb.spec.in |4
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 969a01b..1d6f570 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -146,6 +146,10 @@ development libraries for ctdb
%{_libdir}/libctdb.a
%changelog
+* Thu Mar 1 2012 : Version 1.13
+ - This is the new stable branch for modern features for ctdb.
+ Main new features are performance/scaling improvements for
+ concurrnet fetch and fetch_lock operations.
* Tue Nov 8 2011 : Version 1.12
- Add new tunable : AllowClientDBAttach that can be used to stop
client db access during maintenance operations
--
CTDB repository
[SCM] CTDB repository - annotated tag ctdb-1.13 created - ctdb-1.13
The annotated tag, ctdb-1.13 has been created at 2c3cc0cd57e388eb48d780b691156ac074045570 (tag) tagging 05e75dea9eaa0decc2909e0c2cf1715c81374200 (commit) replaces ctdb-1.12 tagged by Ronnie Sahlberg on Thu Mar 1 12:55:51 2012 +1100 - Log - tag for 1.13 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAABAgAGBQJPTtcyAAoJEB6eS+vwPaeGxCgIAJDHvkwLwF4cbbPS1dW3iUOa izcIa8xCQBRQ2dUWodisynp17w9x6DMj1XIJmOPcRjWB4jrwUNK/KdXM3STq6E0R 5msHGP/s4tJ+QAV/92I855lWruurmd7lGxD48vG+CZEjYXfXUHd678McV8xWaAZW ZmOlrZKmuYtzyxajBkrAL2qMeWGiiUgqrCDoK6Z8iSVusQTvvvXz4hjk44NyAeQR VXi/kXLILaD2xT8AquNRuDxIobDN1gZEdwkL5QlGWpDNdQ82mNm4dnwvRRY57sD/ JEPSR0xQuLFPmj9Jg665syWQDwrAMRX1nLBf8NNr2DbwspVy0bmNWD3DjiDfsGo= =2JQc -END PGP SIGNATURE- Andreas Schneider (1): libutil: Remove obsolete signal type cast. Martin Schwenke (57): Clean up warnings: âtevent_loop_allow_nestingâ is deprecated Clean up warnings: remove changed_flags in monitor_helper Fix typo in ctdb_ltdb_store_server() Clean up warnings: log some unchecked return codes from function calls Clean up warnings: remove set but unused variable from rb_test Clean up warnings: remove unused variable alen from scsi_io Clean up warnings: remove unused function dump_packet() Clean up warnings: -Wunused-but-set-variable in tevent_signal.c Clean up warnings: add -Wno-format-zero-length to CFLAGS Fix ctdb scriptstatus -n all Clean up warnings: popt sure does some strange things Fix lib/replace Clean up warnings: rpcgen output contains unused variable. Added some #ifndefs to stop files being included multiple times. Move some common functions to common/ctdb_ltdb.c Rename ctdb_control_destructor() to ctdb_client_control_destructor() Rename ctdb_ctrl_getscriptstatus() parameter to avoid shadowing a global Rename ctdb_control_get_stat_history() local variable to avoid shadowing. Tests: change ctdb_takeover_tests.c to include ctdbd code Make some ctdb_takeover.c functions static Relax an out of memory message. Eventscripts: Make 40.fs_use use less processes and arguably clearer. Eventscripts - remove $0 from error messages in 40.fs_use Eventscripts - add facility to 10.interface to delete unmanaged IPs ctdb tool - simplify main() by taking most code out of a loop ctdb tool - commands that don't use the daemon can't take -n/--node ctdb tool - short circuit most of the logic in main for non-daemon commands ctdb tool - replace fprintf with DEBUG ctdb tool - move parsing of nodestring to where it is needed ctdb tool - generalise nodestring parsing for -n ctdb tool - factor out status printing functions ctdb tool - new command ctdb nodestatus [nodestring] ctdb tool - remove verify_node() function Rename struct traverse_state to allow tools C files to be #included. Tests - test code for parse_nodestring() function Tests - make a comment more accurate Tests: eventscripts - add tests for CTDB_DELETE_UNEXPECTED_IPS=yes ctdb tool - Fix parse_nodestring() related issues Tests - update test code for ctdb tool code and libctdb stubs libctdb - add ctdb_getvnnmap() ctdb tool - convert control_status() over to use just libctdb() Tests - more libctdb stubs and supporting state faking functions Tests - more libctdb stub test infrastructure Tests - allow tools/ctdb.c:main() to be used ctdb tool - free some memory used by popt Tests - add a version of the ctdb tool that compiles against libctdb stubs Tests: libctdb stubs should fail when current node disconnected Tests: fix usage message in ctdb_tool_libctdb Tests: initial ctdb tool testcases Tests - let run_tests.sh take a list of tests to run Tests - ctdb tool - fix ctdb status test Tests - ctdb tool - add verbose option and output filtering Tests: new test to check that ctdb delip removes the IP from interface. Tests: eventscripts - make init test pass with recent change to 10.interface Tests: eventscripts - fix breakage in some NFS tests Tests - IP allocation simulation - LCP2 = non-deterministic Test - IP allocation simulation - add -e option to run the daemon's algorithm Mathieu Parent (11): config/functions: CTDB_VARDIR is /var/lib/ctdb on Debian-like systems config can be in /etc/default/ instead of /etc/sysconfig/ config can be in /etc/default/ instead of /etc/sysconfig/ (ctdb_gnostics part) Nagios plugin for CTDB Fix ctdb-crash-cleanup sysconfig handling Remove zero-length gnu_printf format string in ctdb_daemon.c (gcc warning) Move platform-specific code to common/system_* GNU/Hurd support Add kFreeBSD support Define ETIME on
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1c2aacd Add open_dir_with_privilege() to ensure we're opening the
correct directory when doing backup requests.
via bca3fb3 Implement FLAG_TRANS2_FIND_BACKUP_INTENT for trans2 with
privileges.
via 3ddd991 Add accessor functions to set a bool priv on a directory
handle. Not yet used, but will be part of FLAG_TRANS2_FIND_BACKUP_INTENT code.
via 89c55485 Add the implementation of
check_reduced_name_with_privilege(). Now to plumb into SMB1 requests.
via 442e79e Add check_reduced_name_with_privilege(),
filename_convert_with_privilege() (currently unimplemented) in order to prepare
for adding SeBackup/SeRestore code to the main fileserver.
from 7cc19af selftest: add more tests for plugin_s4_dc
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1c2aacd6da923efbc0b87e720399417f008f82c2
Author: Jeremy Allison j...@samba.org
Date: Wed Feb 29 16:05:50 2012 -0800
Add open_dir_with_privilege() to ensure we're opening the correct directory
when doing backup requests.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Thu Mar 1 03:50:40 CET 2012 on sn-devel-104
commit bca3fb3eccef620a47e5088cbd79dfa3ea79e814
Author: Jeremy Allison j...@samba.org
Date: Wed Feb 29 12:15:12 2012 -0800
Implement FLAG_TRANS2_FIND_BACKUP_INTENT for trans2 with privileges.
commit 3ddd9916f51f7b64527e9c33a7c3a4849c6f3017
Author: Jeremy Allison j...@samba.org
Date: Wed Feb 29 11:42:21 2012 -0800
Add accessor functions to set a bool priv on a directory handle. Not yet
used, but will be part of FLAG_TRANS2_FIND_BACKUP_INTENT code.
commit 89c55485c3cc6eefdd7af20f79b1d219cace5066
Author: Jeremy Allison j...@samba.org
Date: Wed Feb 29 17:04:08 2012 -0800
Add the implementation of check_reduced_name_with_privilege(). Now to plumb
into
SMB1 requests.
commit 442e79efbdc9dfaf5774c67edb3460603d63d2a5
Author: Jeremy Allison j...@samba.org
Date: Fri Feb 24 14:12:05 2012 -0800
Add check_reduced_name_with_privilege(), filename_convert_with_privilege()
(currently unimplemented) in order to prepare for adding SeBackup/SeRestore
code to the main fileserver.
Not yet plumbed into the main SMB1/SMB2 code.
---
Summary of changes:
source3/include/smb.h| 16 +
source3/smbd/dir.c | 79 +-
source3/smbd/filename.c | 81 +--
source3/smbd/process.c |1 +
source3/smbd/proto.h | 16 -
source3/smbd/reply.c |1 +
source3/smbd/smb2_find.c |1 +
source3/smbd/trans2.c| 51 +-
source3/smbd/vfs.c | 169 ++
9 files changed, 403 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 10e4798..a54d206 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -442,6 +442,7 @@ struct current_user {
};
struct smbd_smb2_request;
+struct privilege_paths;
struct smb_request {
uint8_t cmd;
@@ -495,6 +496,12 @@ struct smb_request {
* Back pointer to smb2 request.
*/
struct smbd_smb2_request *smb2req;
+
+ /*
+* Pathnames used if request done
+* under privilege.
+*/
+ struct privilege_paths *priv_paths;
};
/* Defines for the sent_oplock_break field above. */
@@ -1349,6 +1356,15 @@ struct smb_filename {
SMB_STRUCT_STAT st;
};
+/*
+ * Pathnames used if request done
+ * under privilege.
+ */
+struct privilege_paths {
+ struct smb_filename parent_name;
+ struct smb_filename file_name;
+};
+
/* Used to keep track of deferred opens. */
struct deferred_open_record;
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index d4faf42..103dbc8 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -64,6 +64,7 @@ struct dptr_struct {
char *path;
bool has_wild; /* Set to true if the wcard entry has MS wildcard
characters in it. */
bool did_stat; /* Optimisation for non-wcard searches. */
+ bool priv; /* Directory handle opened with privilege. */
};
static struct smb_Dir *OpenDir_fsp(TALLOC_CTX *mem_ctx, connection_struct
*conn,
@@ -412,6 +413,60 @@ static void dptr_close_oldest(struct
smbd_server_connection *sconn,
}
/
+ Safely do an OpenDir as root, ensuring we're in the right place.
+/
+
+static struct smb_Dir *open_dir_with_privilege(connection_struct *conn,
+ struct smb_request *req,
+ const char *path,
+ const char
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8ea2b5d s3: Fix make bin/smbtorture4 in the autoconf build
via c17d03f heimdal: Fix the build on FreeBSD
from 1c2aacd Add open_dir_with_privilege() to ensure we're opening the
correct directory when doing backup requests.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8ea2b5da0c9a8a2bb4e1c93d96d1d7c500ab88b8
Author: Volker Lendecke v...@samba.org
Date: Thu Mar 1 02:58:28 2012 +0100
s3: Fix make bin/smbtorture4 in the autoconf build
tdb2 support does not work with a system-supplied libtdb yet
Autobuild-User: Volker Lendecke v...@samba.org
Autobuild-Date: Thu Mar 1 05:23:57 CET 2012 on sn-devel-104
commit c17d03f82339141c2942f7bc271424864c01af1a
Author: Volker Lendecke v...@samba.org
Date: Thu Mar 1 02:56:10 2012 +0100
heimdal: Fix the build on FreeBSD
We don't have BACKTRACE_SYMBOLS by default
---
Summary of changes:
source3/Makefile-smbtorture4|2 +-
source4/heimdal/lib/krb5/misc.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index 0dc4706..57fff2b 100644
--- a/source3/Makefile-smbtorture4
+++ b/source3/Makefile-smbtorture4
@@ -6,7 +6,7 @@ SAMBA4_BINARIES=smbtorture,ndrdump
samba4-configure:
@(cd .. \
CFLAGS='' $(WAF) reconfigure || \
- CFLAGS='' $(WAF) configure --enable-socket-wrapper
--enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES)
--enable-auto-reconfigure --enable-developer)
+ CFLAGS='' $(WAF) configure --enable-socket-wrapper
--enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES)
--enable-auto-reconfigure --enable-developer --disable-tdb2)
.PHONY: samba4-configure
diff --git a/source4/heimdal/lib/krb5/misc.c b/source4/heimdal/lib/krb5/misc.c
index ac6720c..39a3282 100644
--- a/source4/heimdal/lib/krb5/misc.c
+++ b/source4/heimdal/lib/krb5/misc.c
@@ -96,7 +96,7 @@ krb5_enomem(krb5_context context)
void
_krb5_debug_backtrace(krb5_context context)
{
-#if defined(HAVE_BACKTRACE) !defined(HEIMDAL_SMALLER)
+#if defined(HAVE_BACKTRACE) defined(HAVE_BACKTRACE_SYMBOLS)
!defined(HEIMDAL_SMALLER)
void *stack[128];
char **strs = NULL;
int i, frames = backtrace(stack, sizeof(stack) / sizeof(stack[0]));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8b01b88 Trivial Comment fix: Supply a missing word in a comment
from 8ea2b5d s3: Fix make bin/smbtorture4 in the autoconf build
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8b01b88fe85ef69a054456540ff3c92927bfc08a
Author: Richard Sharpe realrichardsha...@gmail.com
Date: Wed Feb 29 19:45:29 2012 -0800
Trivial Comment fix: Supply a missing word in a comment
Autobuild-User: Richard Sharpe sha...@samba.org
Autobuild-Date: Thu Mar 1 06:55:44 CET 2012 on sn-devel-104
---
Summary of changes:
source3/include/smb.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smb.h b/source3/include/smb.h
index a54d206..d93f30d 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -461,7 +461,7 @@ struct smb_request {
/*
* Async handling in the main smb processing loop is directed by
* outbuf: reply_xxx routines indicate sync behaviour by putting their
-* reply into outbuf. If they leave it as NULL, they take of it
+* reply into outbuf. If they leave it as NULL, they take care of it
* themselves, possibly later.
*
* If async handling is wanted, the reply_xxx routine must make sure
--
Samba Shared Repository
