[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via dc24e22 smb2_constants: fix a typo
via a1ac670 s3:smb2_server: use SMB2_WATCH_TREE
via 583a538 smb2_constants: add SMB2_WATCH_TREE
via 8b25bc8 s3:smb2_server fix a typo
from 197c185 s3: Fix some blank line endings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit dc24e229a55d07dfc199e302d9cea5377b627e8c
Author: Christian Ambach a...@samba.org
Date: Fri Mar 2 21:35:22 2012 -0800
smb2_constants: fix a typo
Autobuild-User: Christian Ambach a...@samba.org
Autobuild-Date: Sat Mar 3 09:04:40 CET 2012 on sn-devel-104
commit a1ac670a8c69fff47bf120acdee4820081b54bc3
Author: Christian Ambach a...@samba.org
Date: Fri Mar 2 21:34:32 2012 -0800
s3:smb2_server: use SMB2_WATCH_TREE
it makes the code easier to understand if it uses the names specified in
MS-SMB2 instead
of just the underlying values
commit 583a53835b1709327c96f47466ca3db39a0b3d50
Author: Christian Ambach a...@samba.org
Date: Fri Mar 2 21:33:28 2012 -0800
smb2_constants: add SMB2_WATCH_TREE
commit 8b25bc80c95ff79ac87b3db034203369dea959a5
Author: Christian Ambach a...@samba.org
Date: Mon Feb 27 17:52:21 2012 -0800
s3:smb2_server fix a typo
---
Summary of changes:
libcli/smb/smb2_constants.h |5 -
source3/smbd/smb2_notify.c |2 +-
source3/smbd/smb2_server.c |2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h
index 6699dd7..b8180ce 100644
--- a/libcli/smb/smb2_constants.h
+++ b/libcli/smb/smb2_constants.h
@@ -113,7 +113,7 @@
#define SMB2_SHAREFLAG_ACCESS_BASED_DIRECTORY_ENUM 0x0800
#define SMB2_SHAREFLAG_ALL 0x0F33
-/* SMB2 share capafilities */
+/* SMB2 share capabilities */
#define SMB2_SHARE_CAP_DFS 0x8
/* SMB2 create security flags */
@@ -161,6 +161,9 @@
#define SMB2_CREATE_TAG_QFID QFid
#define SMB2_CREATE_TAG_RQLS RqLs
+/* SMB2 notify flags */
+#define SMB2_WATCH_TREE 0x0001
+
/* SMB2 Create ignore some more create_options */
#define SMB2_CREATE_OPTIONS_NOT_SUPPORTED_MASK
(NTCREATEX_OPTIONS_TREE_CONNECTION | \
NTCREATEX_OPTIONS_OPFILTER)
diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c
index 49051bf..be56b18 100644
--- a/source3/smbd/smb2_notify.c
+++ b/source3/smbd/smb2_notify.c
@@ -192,7 +192,7 @@ static struct tevent_req *smbd_smb2_notify_send(TALLOC_CTX
*mem_ctx,
struct smb_request *smbreq;
connection_struct *conn = smb2req-tcon-compat_conn;
files_struct *fsp;
- bool recursive = (in_flags 0x0001) ? true : false;
+ bool recursive = (in_flags SMB2_WATCH_TREE) ? true : false;
NTSTATUS status;
req = tevent_req_create(mem_ctx, state,
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 7233e09..8533157 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1288,7 +1288,7 @@ NTSTATUS smbd_smb2_request_verify_sizes(struct
smbd_smb2_request *req,
/*
* Now check the expected body size,
* where the last byte might be in the
-* dynnamic section..
+* dynamic section..
*/
if (req-in.vector[i+1].iov_len != (expected_body_size 0xFFFE)) {
return NT_STATUS_INVALID_PARAMETER;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a66d0f3 s4:samba-tool domain level raise command - reference SAMDB object correctly from dc24e22 smb2_constants: fix a typo http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a66d0f33eefde8a28247991aa46ac533a63b7793 Author: Matthias Dieter Wallnöfer m...@samba.org Date: Fri Mar 2 20:00:04 2012 +0100 s4:samba-tool domain level raise command - reference SAMDB object correctly https://bugzilla.samba.org/show_bug.cgi?id=8787 Reviewed-by: Jelmer Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org Autobuild-Date: Sat Mar 3 12:54:21 CET 2012 on sn-devel-104 --- Summary of changes: source4/scripting/python/samba/netcmd/domain.py |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index 992698d..4364fe8 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -578,7 +578,7 @@ class cmd_domain_level(Command): samdb.modify(m) # Under partitions m = ldb.Message() -m.dn = ldb.Dn(samdb, CN= + lp.get(workgroup) + ,CN=Partitions,%s % ldb.get_config_basedn()) +m.dn = ldb.Dn(samdb, CN= + lp.get(workgroup) + ,CN=Partitions,%s % samdb.get_config_basedn()) m[nTMixedDomain] = ldb.MessageElement(0, ldb.FLAG_MOD_REPLACE, nTMixedDomain) try: @@ -597,7 +597,7 @@ class cmd_domain_level(Command): # Under partitions m = ldb.Message() m.dn = ldb.Dn(samdb, CN= + lp.get(workgroup) - + ,CN=Partitions,%s % ldb.get_config_basedn()) + + ,CN=Partitions,%s % samdb.get_config_basedn()) m[msDS-Behavior-Version]= ldb.MessageElement( str(new_level_domain), ldb.FLAG_MOD_REPLACE, msDS-Behavior-Version) @@ -622,7 +622,7 @@ class cmd_domain_level(Command): if new_level_forest level_domain: raise CommandError(Forest function level can't be higher than the domain function level(s). Please raise it/them first!) m = ldb.Message() -m.dn = ldb.Dn(samdb, CN=Partitions,%s % ldb.get_config_basedn()) +m.dn = ldb.Dn(samdb, CN=Partitions,%s % samdb.get_config_basedn()) m[msDS-Behavior-Version]= ldb.MessageElement( str(new_level_forest), ldb.FLAG_MOD_REPLACE, msDS-Behavior-Version) -- Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-03-03-1432/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-03-1432/samba3.stderr http://git.samba.org/autobuild.flakey/2012-03-03-1432/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-03-1432/samba4.stderr http://git.samba.org/autobuild.flakey/2012-03-03-1432/samba4.stdout The top commit at the time of the failure was: commit a66d0f33eefde8a28247991aa46ac533a63b7793 Author: Matthias Dieter Wallnöfer m...@samba.org Date: Fri Mar 2 20:00:04 2012 +0100 s4:samba-tool domain level raise command - reference SAMDB object correctly https://bugzilla.samba.org/show_bug.cgi?id=8787 Reviewed-by: Jelmer Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org Autobuild-Date: Sat Mar 3 12:54:21 CET 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 58c26c2 selftest: more precisely skip durable-open, not durable.open via e628380 s4:torture:smb2: start a testsuite for durable v2 handles: durable and persistent opens via f6047af s4:libcli:smb2: set SMB2_CAP_ALL in the negprot via 8dc1873 s3:libsmb: pass smb2 capabilities and client guid in cli_state_create() via 1451e5f s4:libcli:smb2: store the share capabilites in the smb2_tree object via ac43937 smbXcli: add the possiblilty to negotiate client capabilites in smb = 2.2 via 5a5f98d s4:libcli:smb2: allow max protocol 0x0224 via a92b5f3 s4:libcli:smb2: add support for parsing the durable handle v2 response in smb2_create_recv() via dfbf55b s4:libcli:smb2: add support durable handle reconnect v2 blob in smb2_create_send via b1a2ab1 s4:libcli:smb2: add support durable handle request v2 blob in smb2_create_send via edeed15 s4:libcli:smb2: add durable handle v2 data to the smb2_create i/o structure via 76e6733 libcli:smb: define SMB2_DHANDLE_FLAG_PERSISTENT via db632fd libcli:smb: add new SMB2 share flags via 6f86083 libcli:smb: upgrade SMB2_CAP_ALL to include the newly known caps via 8c5d288 libcli:smb: add defines for SMB2.2 share capabilities via 29eed63 libcli:smb: add defines for SMB2.2 global capabilities via 0bdd18e libcli:smb: define DH2Q and DH2C tags for smb2 extra create blobs via 57d99bc s4:torture:smb2: rename some of the durable-handle subtests more systematically via 72ab279 s4:torture:smb2:durable_open: update (C) via 4c92866 s4:torture:smb2:durable-open: skip the open-with-lease test on servers without lease support via d276356 s4:torture:smb2: durable-open: make tables static via 79576df s4:test:smb2:durable_open: skip lease tests when the server does not support leases via 579bb0a s4:torture:smb2:durable_open: remove unused lease variables in the open-oplock test via 87fc8c0 s3:smbd:smb2_write: improve logging in the error case from a66d0f3 s4:samba-tool domain level raise command - reference SAMDB object correctly http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 58c26c2fd43051bb3910e8b7012ab37604da3ef5 Author: Michael Adam ob...@samba.org Date: Sat Mar 3 17:01:38 2012 +0100 selftest: more precisely skip durable-open, not durable.open Autobuild-User: Michael Adam ob...@samba.org Autobuild-Date: Sat Mar 3 19:17:32 CET 2012 on sn-devel-104 commit e6283801f44c2782ba7906fec25c7ee382499a14 Author: Michael Adam ob...@samba.org Date: Mon Feb 27 22:56:37 2012 +0100 s4:torture:smb2: start a testsuite for durable v2 handles: durable and persistent opens commit f6047afb2dfd64fc5c636ecadd66f6c4185e100a Author: Michael Adam ob...@samba.org Date: Thu Mar 1 02:22:36 2012 +0100 s4:libcli:smb2: set SMB2_CAP_ALL in the negprot commit 8dc1873ff530060850c48bd2bb3cff9ab86a6b95 Author: Stefan Metzmacher me...@samba.org Date: Thu Mar 1 01:38:09 2012 +0100 s3:libsmb: pass smb2 capabilities and client guid in cli_state_create() metze Signed-off-by: Michael Adam ob...@samba.org commit 1451e5f66312e37b07d82e48a615b39fe63bd6e3 Author: Michael Adam ob...@samba.org Date: Thu Mar 1 00:29:51 2012 +0100 s4:libcli:smb2: store the share capabilites in the smb2_tree object commit ac43937ce4d5100a82df9d76d50d72b97daaedd3 Author: Michael Adam ob...@samba.org Date: Wed Feb 29 02:02:29 2012 +0100 smbXcli: add the possiblilty to negotiate client capabilites in smb = 2.2 Pair-Programmed-With: Stefan Metzmacher me...@samba.org commit 5a5f98dc70bcca088af061473b8cb465e5aa6ff0 Author: Michael Adam ob...@samba.org Date: Mon Feb 27 20:27:46 2012 +0100 s4:libcli:smb2: allow max protocol 0x0224 commit a92b5f33de6d5d961725f34104a132be1a8dcf52 Author: Michael Adam ob...@samba.org Date: Mon Feb 27 20:15:18 2012 +0100 s4:libcli:smb2: add support for parsing the durable handle v2 response in smb2_create_recv() commit dfbf55bb36e2f5cc798079b3fea2b34cd727e1b3 Author: Michael Adam ob...@samba.org Date: Mon Feb 27 20:15:01 2012 +0100 s4:libcli:smb2: add support durable handle reconnect v2 blob in smb2_create_send commit b1a2ab1fa9222f794217e5917aea193ecf591e3e Author: Michael Adam ob...@samba.org Date: Mon Feb 27 20:15:01 2012 +0100 s4:libcli:smb2: add support durable handle request v2 blob in smb2_create_send commit edeed1552d437b82e88288395d8e1db44ac2999a Author: Michael Adam ob...@samba.org Date: Mon Feb 27 02:35:24 2012 +0100 s4:libcli:smb2: add durable handle v2 data to the smb2_create i/o structure commit 76e6733344dc4d85a96ff108ca05279f44ffc79e Author: Michael Adam ob...@samba.org Date: Fri Mar 2 22:01:01 2012 +0100 libcli:smb: define SMB2_DHANDLE_FLAG_PERSISTENT
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via c887cb6 s3: Fix a bogus if (client_len 0) from 58c26c2 selftest: more precisely skip durable-open, not durable.open http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c887cb6852ce6ec669f87c282d55267c6d3e Author: Volker Lendecke v...@samba.org Date: Sat Mar 3 17:02:01 2012 +0100 s3: Fix a bogus if (client_len 0) On some platforms socklen_t might be unsigned, so comparing for 0 always returns true. Also, tsocket_address_bsd_sockaddr returns ssize_t. Autobuild-User: Volker Lendecke v...@samba.org Autobuild-Date: Sat Mar 3 23:38:31 CET 2012 on sn-devel-104 --- Summary of changes: source3/rpc_server/spoolss/srv_spoolss_nt.c |2 +- 1 files changed, 1 insertions(+), 1 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 ed5edcc..f66bea8 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -2677,7 +2677,7 @@ WERROR _spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct pipes_struct *p, int snum = -1; struct spoolss_NotifyOption *option = r-in.notify_options; struct sockaddr_storage client_ss; - socklen_t client_len; + ssize_t client_len; /* store the notify value in the printer struct */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via cc17dde samba.7: Remove references to long gone testprns and smbsh utilities. from c887cb6 s3: Fix a bogus if (client_len 0) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit cc17ddeca178ef5b28375cdcb6e9a45e42038c09 Author: Jelmer Vernooij jel...@samba.org Date: Sat Mar 3 22:22:50 2012 +0100 samba.7: Remove references to long gone testprns and smbsh utilities. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Sun Mar 4 01:56:19 CET 2012 on sn-devel-104 --- Summary of changes: docs-xml/manpages-3/samba.7.xml | 18 -- 1 files changed, 0 insertions(+), 18 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/samba.7.xml b/docs-xml/manpages-3/samba.7.xml index 95cbf07..1e1d71d 100644 --- a/docs-xml/manpages-3/samba.7.xml +++ b/docs-xml/manpages-3/samba.7.xml @@ -76,16 +76,6 @@ /varlistentry varlistentry - termciterefentryrefentrytitletestprns/refentrytitle - manvolnum1/manvolnum/citerefentry/term - listitemparaThe commandtestprns/command - utility supports testing printer names defined - in your filenameprintcap/filename file used - by Samba./para - /listitem - /varlistentry - - varlistentry termciterefentryrefentrytitlesmbstatus/refentrytitle manvolnum1/manvolnum/citerefentry/term listitemparaThe commandsmbstatus/command @@ -121,14 +111,6 @@ /varlistentry varlistentry - termciterefentryrefentrytitlesmbsh/refentrytitle - manvolnum1/manvolnum/citerefentry/term - listitemparaThe commandsmbsh/command command is - a program that allows you to run a unix shell with - with an overloaded VFS./para/listitem - /varlistentry - - varlistentry termciterefentryrefentrytitlesmbtree/refentrytitle manvolnum1/manvolnum/citerefentry/term listitemparaThe commandsmbtree/command command -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4a8d55c selftest: Remove unused vde functions.
via 9654c61 selftest/README: Expand inconsistent tabs
via f75746e selftest: Remove outdated template.
via ed92f3d selftest: Remove unused and broken target 'windows'.
from cc17dde samba.7: Remove references to long gone testprns and smbsh
utilities.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4a8d55cd7d27fcce6f4bedb6af48a7698a3be86e
Author: Jelmer Vernooij jel...@samba.org
Date: Sun Mar 4 05:08:26 2012 +0100
selftest: Remove unused vde functions.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sun Mar 4 07:54:51 CET 2012 on sn-devel-104
commit 9654c61a9f1bb59ad3e59e59709b732635587993
Author: Jelmer Vernooij jel...@samba.org
Date: Sun Mar 4 01:20:03 2012 +0100
selftest/README: Expand inconsistent tabs
commit f75746e353778113c9fa539336be145d3a12ce24
Author: Jelmer Vernooij jel...@samba.org
Date: Sun Mar 4 01:19:17 2012 +0100
selftest: Remove outdated template.
commit ed92f3de63313eaa269f8f0aca1e7176fc87c18f
Author: Jelmer Vernooij jel...@samba.org
Date: Sun Mar 4 01:18:58 2012 +0100
selftest: Remove unused and broken target 'windows'.
---
Summary of changes:
selftest/README | 22 ++--
selftest/selftest.pl| 31
selftest/target/Template.pm | 47 ---
selftest/target/Windows.pm | 40
4 files changed, 11 insertions(+), 129 deletions(-)
delete mode 100644 selftest/target/Template.pm
delete mode 100644 selftest/target/Windows.pm
Changeset truncated at 500 lines:
diff --git a/selftest/README b/selftest/README
index 206f864..c23d730 100644
--- a/selftest/README
+++ b/selftest/README
@@ -84,22 +84,22 @@ The environments are currently available include
be set:
* USERNAME: Administrator user name
-* PASSWORD: Administrator password
-* DOMAIN: Domain name
-* REALM: Realm name
-* SERVER: DC host name
-* SERVER_IP: DC IPv4 address
-* NETBIOSNAME: DC NetBIOS name
-* NETIOSALIAS: DC NetBIOS alias
+ * PASSWORD: Administrator password
+ * DOMAIN: Domain name
+ * REALM: Realm name
+ * SERVER: DC host name
+ * SERVER_IP: DC IPv4 address
+ * NETBIOSNAME: DC NetBIOS name
+ * NETIOSALIAS: DC NetBIOS alias
- member,s4member,s3member: Domain controller and member server that is
joined to it set up. The
following environment variables will be set:
* USERNAME: Domain administrator user name
-* PASSWORD: Domain administrator password
-* DOMAIN: Domain name
-* REALM: Realm name
-* SERVER: Name of the member server
+ * PASSWORD: Domain administrator password
+ * DOMAIN: Domain name
+ * REALM: Realm name
+ * SERVER: Name of the member server
See Samba.pm, Samba3.pm and Samba4.pm for the full list.
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index a6d4e14..7328300 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -384,40 +384,9 @@ unless ($opt_list) {
$testenv_default = member;
require target::Samba3;
$target = new Samba3($bindir, \%binary_mapping, $srcdir_abs,
$server_maxtime);
- } elsif ($opt_target eq win) {
- die(Windows tests will not run with socket wrapper enabled.)
- if ($opt_socket_wrapper);
- $testenv_default = dc;
- require target::Windows;
- $target = new Windows();
}
}
-#
-# Start a Virtual Distributed Ethernet Switch
-# Returns the pid of the switch.
-#
-sub start_vde_switch($)
-{
- my ($path) = @_;
-
- system(vde_switch --pidfile $path/vde.pid --sock $path/vde.sock
--daemon);
-
- open(PID, $path/vde.pid);
- PID =~ /([0-9]+)/;
- my $pid = $1;
- close(PID);
-
- return $pid;
-}
-
-# Stop a Virtual Distributed Ethernet Switch
-sub stop_vde_switch($)
-{
- my ($pid) = @_;
- kill 9, $pid;
-}
-
sub read_test_regexes($)
{
my ($name) = @_;
diff --git a/selftest/target/Template.pm b/selftest/target/Template.pm
deleted file mode 100644
index 2b47ad1..000
--- a/selftest/target/Template.pm
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/perl
-# Copyright (C) 2009 Stefan Metzmacher me...@samba.org
-# Published under the GNU GPL, v3 or later.
-
-package Template;
-
-use strict;
-
-sub new($$) {
- my ($classname) = @_;
- my $self = {
- classname = $classname
- };
- bless $self;
- return $self;
-}
-
-sub teardown_env($$)
-{
- my ($self, $envvars) = @_;
-
- return 0;
-}
-
-sub getlog_env($$)
