[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Fri Jun 21 14:58:02 MDT 2013
The branch, master has been updated
via bbe09b3 Add missing SMB2/SMB3 share capability flag define
via 06e5401 lsa4: Fix a set but unused variable warning
via 7d5daaa lsa4: Remove an unused variable
via 2448fe3 lsa4: Remove an unused variable
via 720b4d3 lsa4: Remove an unused variable
via 6c49f90 Fix glusterfs backend crash found at the Microsoft interop event.
from b96cea4 Fix some blank line endings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bbe09b3319630a3892e2350dace86d6953b0ae3d
Author: Steve French <smfrench at gmail.com>
Date: Fri Jun 21 13:40:14 2013 -0500
Add missing SMB2/SMB3 share capability flag define
SMB3.02 adds SHARE_CAP_ASYMMETRIC
Signed-off-by: Steve French <smfrench at gmail.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Fri Jun 21 22:57:16 CEST 2013 on sn-devel-104
commit 06e5401f7bb69836e81a177259cded0c1e1d252d
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 21 18:15:57 2013 +0200
lsa4: Fix a set but unused variable warning
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 7d5daaa9f49f1a4226638a67f9d14f5d959b7363
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 21 18:12:58 2013 +0200
lsa4: Remove an unused variable
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 2448fe3ffeef0f37907a4aa4b3f7d269d827afa1
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 21 18:12:41 2013 +0200
lsa4: Remove an unused variable
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 720b4d3932ffc77a85622cc28347181625a2f5d0
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 21 18:12:17 2013 +0200
lsa4: Remove an unused variable
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 6c49f90965327a7f70d24fecdb7529f3f78fc9e4
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jun 21 09:56:22 2013 -0700
Fix glusterfs backend crash found at the Microsoft interop event.
Based on a fix originally from Raghavendra Talur <rtalur at redhat.com>.
When a new document is created in explorer, a check for file_exist is made.
vfs_gluster_get_real_filename was returning 0 even when the file did not
exist.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: "Christopher R. Hertel" <crh at ubiqx.mn.org>
-----------------------------------------------------------------------
Summary of changes:
libcli/smb/smb2_constants.h | 1 +
source3/modules/vfs_glusterfs.c | 6 ++++--
source4/rpc_server/lsa/dcesrv_lsa.c | 11 -----------
3 files changed, 5 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h
index 60fedbb..54ab250 100644
--- a/libcli/smb/smb2_constants.h
+++ b/libcli/smb/smb2_constants.h
@@ -157,6 +157,7 @@
#define SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY 0x10 /* in dialect >= 0x222 */
#define SMB2_SHARE_CAP_SCALEOUT 0x20 /* in dialect >= 0x222 */
#define SMB2_SHARE_CAP_CLUSTER 0x40 /* in dialect >= 0x222 */
+#define SMB2_SHARE_CAP_ASYMMETRIC 0x80 /* in dialect >= 0x302 */
/* SMB2 create security flags */
#define SMB2_SECURITY_DYNAMIC_TRACKING 0x01
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 24e1bda..1323e0e 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -894,8 +894,10 @@ static int vfs_gluster_get_real_filename(struct vfs_handle_struct *handle,
"user.glusterfs.get_real_filename:%s", name);
ret = glfs_getxattr(handle->data, path, key_buf, val_buf, NAME_MAX + 1);
- if (ret == -1 && errno == ENODATA) {
- errno = EOPNOTSUPP;
+ if (ret == -1) {
+ if (errno == ENODATA) {
+ errno = EOPNOTSUPP;
+ }
return -1;
}
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index b2e3c1d..02ff0da 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -3422,13 +3422,10 @@ static NTSTATUS dcesrv_lsa_LookupPrivValue(struct dcesrv_call_state *dce_call,
struct lsa_LookupPrivValue *r)
{
struct dcesrv_handle *h;
- struct lsa_policy_state *state;
int id;
DCESRV_PULL_HANDLE(h, r->in.handle, LSA_HANDLE_POLICY);
- state = h->data;
-
id = sec_privilege_id(r->in.name->string);
if (id == SEC_PRIV_INVALID) {
return NT_STATUS_NO_SUCH_PRIVILEGE;
@@ -3449,14 +3446,11 @@ static NTSTATUS dcesrv_lsa_LookupPrivName(struct dcesrv_call_state *dce_call,
struct lsa_LookupPrivName *r)
{
struct dcesrv_handle *h;
- struct lsa_policy_state *state;
struct lsa_StringLarge *name;
const char *privname;
DCESRV_PULL_HANDLE(h, r->in.handle, LSA_HANDLE_POLICY);
- state = h->data;
-
if (r->in.luid->high != 0) {
return NT_STATUS_NO_SUCH_PRIVILEGE;
}
@@ -3487,14 +3481,11 @@ static NTSTATUS dcesrv_lsa_LookupPrivDisplayName(struct dcesrv_call_state *dce_c
struct lsa_LookupPrivDisplayName *r)
{
struct dcesrv_handle *h;
- struct lsa_policy_state *state;
struct lsa_StringLarge *disp_name = NULL;
enum sec_privilege id;
DCESRV_PULL_HANDLE(h, r->in.handle, LSA_HANDLE_POLICY);
- state = h->data;
-
id = sec_privilege_id(r->in.name->string);
if (id == SEC_PRIV_INVALID) {
return NT_STATUS_NO_SUCH_PRIVILEGE;
@@ -4122,7 +4113,6 @@ static NTSTATUS check_ft_info(TALLOC_CTX *mem_ctx,
struct dom_sid *sid;
const char *tname;
size_t dns_len;
- size_t nb_len;
size_t tlen;
NTSTATUS nt_status;
uint32_t new_fti_idx;
@@ -4159,7 +4149,6 @@ static NTSTATUS check_ft_info(TALLOC_CTX *mem_ctx,
dns_name = nrec->data.info.dns_name.string;
dns_len = nrec->data.info.dns_name.size;
nb_name = nrec->data.info.netbios_name.string;
- nb_len = nrec->data.info.netbios_name.size;
sid = &nrec->data.info.sid;
break;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list