[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via f9e42b7 Add entry for SUSE from f73f04c Add h2; make image clickable; cleanup http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit f9e42b7ae737d132169b3ad25a62d775a2b347d0 Author: Lars Müller l...@samba.org Date: Thu Sep 29 11:50:58 2011 +0200 Add entry for SUSE --- Summary of changes: vendors/index.html |3 +++ vendors/suse.html | 14 ++ vendors/suse.png | Bin 0 - 3438 bytes 3 files changed, 17 insertions(+), 0 deletions(-) create mode 100644 vendors/suse.html create mode 100644 vendors/suse.png Changeset truncated at 500 lines: diff --git a/vendors/index.html b/vendors/index.html index 8009fb8..5bd2ffc 100755 --- a/vendors/index.html +++ b/vendors/index.html @@ -70,6 +70,9 @@ see the A HREF=/samba/support/Samba Support/A page. !--#include virtual=sgi.html -- hrbr +!--#include virtual=suse.html -- + +hrbr !--#include virtual=hp3000.html -- hrbr diff --git a/vendors/suse.html b/vendors/suse.html new file mode 100644 index 000..58733e4 --- /dev/null +++ b/vendors/suse.html @@ -0,0 +1,14 @@ +h2SUSE/h2 + +a href=http://www.suse.com/; + img src=suse.png alt=SUSE Linux style=float:left;margin:5px / +/a + +pSUSE is a leading provider of enterprise Linux solutions that increase agility, +reduce cost and manage complexity in dynamic environments. With a portfolio +centered around SUSE Linux Enterprise, the most interoperable platform for +mission-critical computing, SUSE enables organizations to confidently deliver +computing services across physical, virtual and cloud environments. With our +award-winning products, open source communities and ecosystem of partnerships, +SUSE solutions empower thousands of organizations around the world. For more +information, visit a href=http://www.suse.com/;www.suse.com/a./p diff --git a/vendors/suse.png b/vendors/suse.png new file mode 100644 index 000..477a4c8 Binary files /dev/null and b/vendors/suse.png differ -- Samba Website Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 025db66 Add some p to make it easier to read from f9e42b7 Add entry for SUSE http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 025db6680bfae76fd8d8a7e767c4879193308876 Author: Lars Müller l...@samba.org Date: Thu Sep 29 12:13:52 2011 +0200 Add some p to make it easier to read --- Summary of changes: vendors/suse.html | 20 1 files changed, 12 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/vendors/suse.html b/vendors/suse.html index 58733e4..f415319 100644 --- a/vendors/suse.html +++ b/vendors/suse.html @@ -4,11 +4,15 @@ img src=suse.png alt=SUSE Linux style=float:left;margin:5px / /a -pSUSE is a leading provider of enterprise Linux solutions that increase agility, -reduce cost and manage complexity in dynamic environments. With a portfolio -centered around SUSE Linux Enterprise, the most interoperable platform for -mission-critical computing, SUSE enables organizations to confidently deliver -computing services across physical, virtual and cloud environments. With our -award-winning products, open source communities and ecosystem of partnerships, -SUSE solutions empower thousands of organizations around the world. For more -information, visit a href=http://www.suse.com/;www.suse.com/a./p +pSUSE is a leading provider of enterprise Linux solutions that increase +agility, reduce cost and manage complexity in dynamic environments./p + +pWith a portfolio centered around SUSE Linux Enterprise, the most +interoperable platform for mission-critical computing, SUSE enables +organizations to confidently deliver computing services across physical, +virtual and cloud environments. With our award-winning products, open source +communities and ecosystem of partnerships, SUSE solutions empower thousands of +organizations around the world./p + +pFor more information, visit +a href=http://www.suse.com/;www.suse.com/a./p -- Samba Website Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 090d5a4 Add some more space between icon and text from 025db66 Add some p to make it easier to read http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 090d5a4cceffa1a44fb3ca61a037205eb5c469d1 Author: Lars Müller l...@samba.org Date: Thu Sep 29 12:19:10 2011 +0200 Add some more space between icon and text --- Summary of changes: vendors/suse.html |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/vendors/suse.html b/vendors/suse.html index f415319..15df9c3 100644 --- a/vendors/suse.html +++ b/vendors/suse.html @@ -1,7 +1,7 @@ h2SUSE/h2 a href=http://www.suse.com/; - img src=suse.png alt=SUSE Linux style=float:left;margin:5px / + img src=suse.png alt=SUSE Linux style=float:left;margin:10px / /a pSUSE is a leading provider of enterprise Linux solutions that increase -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 27195b3 socket_wrapper: correctly handle dup()/dup2() ref counting
via a110d05 socket_wrapper: pass down the fd explictly from the
swrap_*() to the real_*() calls
from ea00f0e s3:smb2_server: SMB2_OP_CANCEL requests don't have to be
signed
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 27195b3ac5970037445e8d05efb77b39cbfdd9ba
Author: Stefan Metzmacher me...@samba.org
Date: Wed Sep 28 23:09:49 2011 +0200
socket_wrapper: correctly handle dup()/dup2() ref counting
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Thu Sep 29 13:13:56 CEST 2011 on sn-devel-104
commit a110d05f679e216fed7b1b1724ac17898024e834
Author: Stefan Metzmacher me...@samba.org
Date: Wed Sep 28 23:04:51 2011 +0200
socket_wrapper: pass down the fd explictly from the swrap_*() to the
real_*() calls
metze
---
Summary of changes:
lib/socket_wrapper/socket_wrapper.c | 187 +--
1 files changed, 92 insertions(+), 95 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/socket_wrapper/socket_wrapper.c
b/lib/socket_wrapper/socket_wrapper.c
index ddfc74f..a54f50f 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -212,11 +212,14 @@ static size_t socket_length(int family)
return 0;
}
-
+struct socket_info_fd {
+ struct socket_info_fd *prev, *next;
+ int fd;
+};
struct socket_info
{
- int fd;
+ struct socket_info_fd *fds;
int family;
int type;
@@ -585,8 +588,12 @@ static struct socket_info *find_socket_info(int fd)
{
struct socket_info *i;
for (i = sockets; i; i = i-next) {
- if (i-fd == fd)
- return i;
+ struct socket_info_fd *f;
+ for (f = i-fds; f; f = f-next) {
+ if (f-fd == fd) {
+ return i;
+ }
+ }
}
return NULL;
@@ -1405,6 +1412,7 @@ static void swrap_dump_packet(struct socket_info *si,
_PUBLIC_ int swrap_socket(int family, int type, int protocol)
{
struct socket_info *si;
+ struct socket_info_fd *fi;
int fd;
int real_type = type;
#ifdef SOCK_CLOEXEC
@@ -1466,6 +1474,10 @@ _PUBLIC_ int swrap_socket(int family, int type, int
protocol)
if (fd == -1) return -1;
si = (struct socket_info *)calloc(1, sizeof(struct socket_info));
+ if (si == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
si-family = family;
@@ -1473,16 +1485,26 @@ _PUBLIC_ int swrap_socket(int family, int type, int
protocol)
* the type, not the flags */
si-type = real_type;
si-protocol = protocol;
- si-fd = fd;
+ fi = (struct socket_info_fd *)calloc(1, sizeof(struct socket_info_fd));
+ if (fi == NULL) {
+ free(si);
+ errno = ENOMEM;
+ return -1;
+ }
+
+ fi-fd = fd;
+
+ SWRAP_DLIST_ADD(si-fds, fi);
SWRAP_DLIST_ADD(sockets, si);
- return si-fd;
+ return fd;
}
_PUBLIC_ int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
{
struct socket_info *parent_si, *child_si;
+ struct socket_info_fd *child_fi;
int fd;
struct sockaddr_un un_addr;
socklen_t un_addrlen = sizeof(un_addr);
@@ -1535,7 +1557,19 @@ _PUBLIC_ int swrap_accept(int s, struct sockaddr *addr,
socklen_t *addrlen)
child_si = (struct socket_info *)malloc(sizeof(struct socket_info));
memset(child_si, 0, sizeof(*child_si));
- child_si-fd = fd;
+ child_fi = (struct socket_info_fd *)calloc(1, sizeof(struct
socket_info_fd));
+ if (child_fi == NULL) {
+ free(child_si);
+ free(my_addr);
+ close(fd);
+ errno = ENOMEM;
+ return -1;
+ }
+
+ child_fi-fd = fd;
+
+ SWRAP_DLIST_ADD(child_si-fds, child_fi);
+
child_si-family = parent_si-family;
child_si-type = parent_si-type;
child_si-protocol = parent_si-protocol;
@@ -1557,6 +1591,7 @@ _PUBLIC_ int swrap_accept(int s, struct sockaddr *addr,
socklen_t *addrlen)
ret = real_getsockname(fd, (struct sockaddr *)(void *)un_my_addr,
un_my_addrlen);
if (ret == -1) {
+ free(child_fi);
free(child_si);
close(fd);
return ret;
@@ -1566,6 +1601,7 @@ _PUBLIC_ int swrap_accept(int s, struct sockaddr *addr,
socklen_t *addrlen)
ret = sockaddr_convert_from_un(child_si, un_my_addr, un_my_addrlen,
child_si-family,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 08573c2 s4: add SMB2_FSCTL opcodes
via dbcd59f s3-smb2_server: fix ioctl InputOffset checking
via 1848295 s3-smb2_server: SMB2_OP_IOCTL doesn't require at least 1
dyn byte
via 392fd0d s4-torture: add smb2 ioctl test suite
via bd5e975 s4-torture: remove unchecked read from smb2 create
from 27195b3 socket_wrapper: correctly handle dup()/dup2() ref counting
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 08573c2b923d565ed85027376ff88f91a9ee0c77
Author: David Disseldorp dd...@suse.de
Date: Mon Sep 26 13:38:16 2011 +0200
s4: add SMB2_FSCTL opcodes
Also, skip samba4.smb2.ioctl for now. Snapshots are not supported by
default.
Autobuild-User: David Disseldorp dd...@samba.org
Autobuild-Date: Thu Sep 29 14:47:05 CEST 2011 on sn-devel-104
commit dbcd59f46b0d2125dfb6eb82b3d92be228c6ae4b
Author: David Disseldorp dd...@suse.de
Date: Wed Sep 28 14:45:42 2011 +0200
s3-smb2_server: fix ioctl InputOffset checking
Currently the InputOffset is always check to point to the input data
buffer, regardless of whether input data is present.
Signed-off-by: Stefan Metzmacher me...@samba.org
commit 18482957daa2e2122ef39426a8fff167df3c9377
Author: David Disseldorp dd...@suse.de
Date: Sun Sep 25 23:39:07 2011 +0200
s3-smb2_server: SMB2_OP_IOCTL doesn't require at least 1 dyn byte
Signed-off-by: Stefan Metzmacher me...@samba.org
commit 392fd0db38a2382b5f96d1a5882ea4e4fcda9d01
Author: David Disseldorp dd...@suse.de
Date: Thu Sep 22 22:23:08 2011 +0200
s4-torture: add smb2 ioctl test suite
Currently only covers FSCTL_GET_SHADOW_COPY_DATA.
Signed-off-by: Stefan Metzmacher me...@samba.org
commit bd5e9758f8350b5137dccf0d5ebf24aefb970997
Author: David Disseldorp dd...@suse.de
Date: Wed Sep 21 21:50:29 2011 +0200
s4-torture: remove unchecked read from smb2 create
Add a corresponding test case to smb2.read.
Signed-off-by: Stefan Metzmacher me...@samba.org
---
Summary of changes:
source3/smbd/smb2_ioctl.c | 11 -
source3/smbd/smb2_server.c |1 +
source4/libcli/raw/interfaces.h| 14 ++
source4/selftest/skip |1 +
source4/torture/smb2/ioctl.c | 87
source4/torture/smb2/read.c|9
source4/torture/smb2/smb2.c|1 +
source4/torture/smb2/util.c|9
source4/torture/smb2/wscript_build |2 +-
9 files changed, 124 insertions(+), 11 deletions(-)
create mode 100644 source4/torture/smb2/ioctl.c
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c
index 491c3fd..5a766e1 100644
--- a/source3/smbd/smb2_ioctl.c
+++ b/source3/smbd/smb2_ioctl.c
@@ -68,7 +68,16 @@ NTSTATUS smbd_smb2_request_process_ioctl(struct
smbd_smb2_request *req)
in_max_output_length= IVAL(inbody, 0x2C);
in_flags= IVAL(inbody, 0x30);
- if (in_input_offset != (SMB2_HDR_BODY + req-in.vector[i+1].iov_len)) {
+ /*
+* InputOffset (4 bytes): The offset, in bytes, from the beginning of
+* the SMB2 header to the input data buffer. If no input data is
+* required for the FSCTL/IOCTL command being issued, the client SHOULD
+* set this value to 0.49
+* 49 If no input data is required for the FSCTL/IOCTL command being
+* issued, Windows-based clients set this field to any value.
+*/
+ if ((in_input_length 0)
+ (in_input_offset != (SMB2_HDR_BODY + req-in.vector[i+1].iov_len)))
{
return smbd_smb2_request_error(req,
NT_STATUS_INVALID_PARAMETER);
}
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index abb60e4..84b55cc 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1283,6 +1283,7 @@ NTSTATUS smbd_smb2_request_verify_sizes(struct
smbd_smb2_request *req,
opcode = SVAL(inhdr, SMB2_HDR_OPCODE);
switch (opcode) {
+ case SMB2_OP_IOCTL:
case SMB2_OP_GETINFO:
min_dyn_size = 0;
break;
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 13586c3..7f42926 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -2191,6 +2191,20 @@ enum smb_ioctl_level {
RAW_IOCTL_SMB2_NO_HANDLE
};
+/* 2.2.31 SMB2 IOCTL Request */
+#define SMB2_IOCTL_FLAG_IS_FSCTL 0x0001
+
+#define SMB2_FSCTL_DFS_GET_REFERRALS 0x00060194
+#define SMB2_FSCTL_PIPE_PEEK 0x0011400C
+#define SMB2_FSCTL_PIPE_WAIT 0x00110018
+#define SMB2_FSCTL_PIPE_TRANSCEIVE 0x0011C017
+#define
Re: [SCM] Samba Shared Repository - branch master updated
Hi David, On 09/29/2011 02:48 PM, David Disseldorp wrote: The branch, master has been updated via 08573c2 s4: add SMB2_FSCTL opcodes via dbcd59f s3-smb2_server: fix ioctl InputOffset checking via 1848295 s3-smb2_server: SMB2_OP_IOCTL doesn't require at least 1 dyn byte via 392fd0d s4-torture: add smb2 ioctl test suite via bd5e975 s4-torture: remove unchecked read from smb2 create from 27195b3 socket_wrapper: correctly handle dup()/dup2() ref counting http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master Congratulations to your first commit (not your first patch of course) ! And welcome on board! Cheers, Guenther -- Günther DeschnerGPG-ID: 8EE11688 Red Hat gdesch...@redhat.com Samba Team g...@samba.org
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 24d53eb s4:smb_server/smb2: make sure we sign the final session
setup
from 08573c2 s4: add SMB2_FSCTL opcodes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 24d53ebe441510805ff3e15696fa763c1bb96423
Author: Stefan Metzmacher me...@samba.org
Date: Thu Sep 29 10:09:41 2011 +0200
s4:smb_server/smb2: make sure we sign the final session setup
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Thu Sep 29 18:59:54 CEST 2011 on sn-devel-104
---
Summary of changes:
source4/smb_server/smb2/sesssetup.c | 13 ++---
1 files changed, 10 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/smb_server/smb2/sesssetup.c
b/source4/smb_server/smb2/sesssetup.c
index 60e5500..243765f 100644
--- a/source4/smb_server/smb2/sesssetup.c
+++ b/source4/smb_server/smb2/sesssetup.c
@@ -67,6 +67,7 @@ static void smb2srv_sesssetup_callback(struct tevent_req
*subreq)
union smb_sesssetup *io = ctx-io;
struct smbsrv_session *smb_sess = ctx-smb_sess;
struct auth_session_info *session_info = NULL;
+ enum security_user_level user_level;
NTSTATUS status;
packet_recv_enable(req-smb_conn-packet);
@@ -92,10 +93,16 @@ static void smb2srv_sesssetup_callback(struct tevent_req
*subreq)
}
req-session = smb_sess;
- if (smb_sess-smb2_signing.required) {
- /* activate smb2 signing on the session */
- smb_sess-smb2_signing.active = true;
+ user_level = security_session_user_level(smb_sess-session_info, NULL);
+ if (user_level = SECURITY_USER) {
+ if (smb_sess-smb2_signing.required) {
+ /* activate smb2 signing on the session */
+ smb_sess-smb2_signing.active = true;
+ }
+ /* we need to sign the session setup response */
+ req-is_signed = true;
}
+
done:
io-smb2.out.uid = smb_sess-vuid;
failed:
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8daf9df s3:smb2cli: fix the num_expected == 0 logic in
smb2cli_req_recv()
from 24d53eb s4:smb_server/smb2: make sure we sign the final session
setup
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8daf9df5148bc3977c676e4dec3263486d35fde9
Author: Stefan Metzmacher me...@samba.org
Date: Fri Sep 23 22:47:33 2011 +0200
s3:smb2cli: fix the num_expected == 0 logic in smb2cli_req_recv()
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Thu Sep 29 22:15:06 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/libsmb/smb2cli_base.c | 10 +++---
1 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/smb2cli_base.c b/source3/libsmb/smb2cli_base.c
index f8b2f6e..b85158f 100644
--- a/source3/libsmb/smb2cli_base.c
+++ b/source3/libsmb/smb2cli_base.c
@@ -690,9 +690,8 @@ NTSTATUS smb2cli_req_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
bool found_size = false;
size_t i;
- if (num_expected == 0) {
- found_status = true;
- found_size = true;
+ if (piov != NULL) {
+ *piov = NULL;
}
if (tevent_req_is_nterror(req, status)) {
@@ -710,6 +709,11 @@ NTSTATUS smb2cli_req_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
return status;
}
+ if (num_expected == 0) {
+ found_status = true;
+ found_size = true;
+ }
+
status = NT_STATUS(IVAL(state-recv_iov[0].iov_base, SMB2_HDR_STATUS));
body_size = SVAL(state-recv_iov[1].iov_base, 0);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d883cc6 Bug 7551: Return error of cli_push when 'put - /some/file'
is used
from 8daf9df s3:smb2cli: fix the num_expected == 0 logic in
smb2cli_req_recv()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d883cc664cac81633a60e5b04f99f23a3577ae65
Author: Bram fn...@lists.wizbit.be
Date: Thu Sep 29 11:28:03 2011 +0200
Bug 7551: Return error of cli_push when 'put - /some/file' is used
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Thu Sep 29 23:47:02 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/client/client.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index 30f8b8b..beb3dca 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1948,7 +1948,7 @@ static int do_put(const char *rname, const char *lname,
bool reput)
if (f == x_stdin) {
cli_shutdown(cli);
- exit(0);
+ exit(rc);
}
return rc;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 27e2a4a Second part of bug #8494 - Remove experimental label on VFS ACL modules. from d883cc6 Bug 7551: Return error of cli_push when 'put - /some/file' is used http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 27e2a4ab4ae22359b9d289784ef4c903f7e793e8 Author: Jeremy Allison j...@samba.org Date: Thu Sep 29 17:16:58 2011 -0700 Second part of bug #8494 - Remove experimental label on VFS ACL modules. Fix the docs. Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Fri Sep 30 03:50:43 CEST 2011 on sn-devel-104 --- Summary of changes: docs-xml/manpages-3/vfs_acl_tdb.8.xml |4 docs-xml/manpages-3/vfs_acl_xattr.8.xml |4 2 files changed, 0 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_tdb.8.xml index 762364f..646c5ba 100644 --- a/docs-xml/manpages-3/vfs_acl_tdb.8.xml +++ b/docs-xml/manpages-3/vfs_acl_tdb.8.xml @@ -40,10 +40,6 @@ filename$LOCKDIR/file_ntacls.tdb/filename. /para - paraPlease note that this module is - emphasisexperimental/emphasis! - /para - paraThis module is stackable./para /refsect1 diff --git a/docs-xml/manpages-3/vfs_acl_xattr.8.xml b/docs-xml/manpages-3/vfs_acl_xattr.8.xml index e1eb92a..d428cc2 100644 --- a/docs-xml/manpages-3/vfs_acl_xattr.8.xml +++ b/docs-xml/manpages-3/vfs_acl_xattr.8.xml @@ -44,10 +44,6 @@ /command). /para - paraPlease note that this module is - emphasisexperimental/emphasis! - /para - paraThis module is stackable./para /refsect1 -- Samba Shared Repository
