[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Sun Oct 22 19:41:03 UTC 2017
The branch, master has been updated
via c3a1348 xattr.idl: Don't generate an interface table
via 0bd5d7b nfs4acls: Don't generate an interface table for nfs4acls.idl
via abcb983 nfs4acls: Slightly simplify smb_add_ace4
via 5c520f7 nfs4acls: Fix a debug message
from e6f3631 s3/smbd: update some more DEBUG macros in smbd_smb2_create_send
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c3a1348371ddcd06730ad05d7946e0f0da58ee21
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 15 08:25:34 2017 +0200
xattr.idl: Don't generate an interface table
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Sun Oct 22 21:40:16 CEST 2017 on sn-devel-144
commit 0bd5d7bcbeebed9308bedf5c3854be37d9d33f72
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 15 08:17:22 2017 +0200
nfs4acls: Don't generate an interface table for nfs4acls.idl
Nobody uses the function nfs4acl_test.
It took a while to figure out how to get this to build. The "uuid" line in the
idl file triggers pidl to generate the function table entry, which in turn then
triggers tables.pl to register this interface
./bin/default/source4/librpc/gen_ndr/tables.c. We could for example do the same
with xattr_parse_DOSATTRIB. Nobody uses this.
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit abcb98343020d771ce1ae99f034b137fbce0d2b3
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 15 06:02:13 2017 +0200
nfs4acls: Slightly simplify smb_add_ace4
The comment was a bit confusing to me, it took a few seconds too many to figure
out *why* setting NULL is not required. Remove it :-)
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5c520f79a68a1e68cbd0fe48287c106d0967af0c
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 15 05:58:05 2017 +0200
nfs4acls: Fix a debug message
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/nfs4acl.idl | 6 +-----
librpc/idl/wscript_build | 7 ++++---
librpc/idl/xattr.idl | 5 -----
source3/modules/nfs4_acls.c | 5 ++---
source4/librpc/wscript_build | 2 --
5 files changed, 7 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/nfs4acl.idl b/librpc/idl/nfs4acl.idl
index 13a6d13..5a3d026 100644
--- a/librpc/idl/nfs4acl.idl
+++ b/librpc/idl/nfs4acl.idl
@@ -7,7 +7,7 @@
import "misc.idl", "security.idl";
-[ uuid("18763978-8625-abc3-54ca-9892bacdf321"),
+[
version(1.0),
pointer_default(unique)
]
@@ -39,8 +39,4 @@ interface nfs4acl_interface
uint32 a_other_mask;
nfs4ace ace[a_count];
} nfs4acl;
-
- NTSTATUS nfs4acl_test(
- [in] nfs4acl acl
- );
}
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index 899708c..75eba7d 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
audiosrv.idl dfsblobs.idl dsbackup.idl eventlog.idl file_id.idl keysvc.idl
msgsvc.idl ntsvcs.idl remact.idl security.idl smb_acl.idl unixinfo.idl wzcsvc.idl
browser.idl dfs.idl dssetup.idl frsapi.idl krb5pac.idl
- named_pipe_auth.idl orpc.idl rot.idl spoolss.idl w32time.idl xattr.idl
+ named_pipe_auth.idl orpc.idl rot.idl spoolss.idl w32time.idl
dbgidl.idl dnsserver.idl echo.idl frsrpc.idl lsa.idl nbt.idl dns.idl
oxidresolver.idl samr.idl server_id.idl srvsvc.idl winreg.idl dcerpc.idl
drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
@@ -24,7 +24,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
output_dir='../gen_ndr')
bld.SAMBA_PIDL_LIST('PIDL',
- 'idmap.idl messaging.idl',
+ 'idmap.idl messaging.idl xattr.idl',
options='--header --ndr-parser --client --python',
output_dir='../gen_ndr')
@@ -37,12 +37,13 @@ bld.SAMBA_PIDL_LIST('PIDL',
printcap.idl
fsrvp_state.idl
cab.idl
+ nfs4acl.idl
''',
options='--header --ndr-parser',
output_dir='../gen_ndr')
bld.SAMBA_PIDL_LIST('PIDL',
- 'dnsp.idl nfs4acl.idl',
+ 'dnsp.idl',
options='--header --ndr-parser --client --python',
output_dir='../gen_ndr')
diff --git a/librpc/idl/xattr.idl b/librpc/idl/xattr.idl
index 0098b89..38d32fd 100644
--- a/librpc/idl/xattr.idl
+++ b/librpc/idl/xattr.idl
@@ -11,7 +11,6 @@
import "security.idl";
[
- uuid("12345778-1234-abcd-0001-00000002"),
version(0.0),
helper("../librpc/ndr/ndr_xattr.h"),
pyhelper("librpc/ndr/py_xattr.c"),
@@ -105,10 +104,6 @@ interface xattr
[switch_is(version)] xattr_DosInfo info;
} xattr_DOSATTRIB;
- void xattr_parse_DOSATTRIB(
- [in] xattr_DOSATTRIB x
- );
-
/* we store DOS style extended attributes in a DosEAs xattr */
const char *XATTR_DOSEAS_NAME = "user.DosEAs";
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index b755344..19f0fef 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -180,12 +180,11 @@ struct SMB4ACE_T *smb_add_ace4(struct SMB4ACL_T *acl, SMB_ACE4PROP_T *prop)
ace = talloc_zero(acl, struct SMB4ACE_T);
if (ace==NULL)
{
- DEBUG(0, ("TALLOC_SIZE failed\n"));
+ DBG_ERR("talloc_zero failed\n");
errno = ENOMEM;
return NULL;
}
- /* ace->next = NULL not needed */
- memcpy(&ace->prop, prop, sizeof(SMB_ACE4PROP_T));
+ ace->prop = *prop;
if (acl->first==NULL)
{
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index a381a65..1c3f8de 100644
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -93,7 +93,6 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
NDR_TRKWKS
NDR_KEYSVC
ndr-krb5pac
- NDR_XATTR
NDR_SCHANNEL
NDR_ROT
NDR_DRSBLOBS
@@ -110,7 +109,6 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
NDR_FRSRPC
NDR_FRSAPI
NDR_FRSTRANS
- NDR_NFS4ACL
NDR_NTP_SIGND
NDR_DCOM
NDR_WMI
--
Samba Shared Repository
More information about the samba-cvs
mailing list