diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-04-12 20:24:44 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-05-09 06:18:20 +0200 |
| commit | d87b81fa303ee297685f4eb5599010901ed68145 (patch) | |
| tree | e9c808ce6977fefc3c88253354b210d7c16a66b7 /source4 | |
| parent | 41f1c3969a3f381379ca665b2d992070c8e50227 (diff) | |
| download | samba-d87b81fa303ee297685f4eb5599010901ed68145.tar.gz samba-d87b81fa303ee297685f4eb5599010901ed68145.tar.bz2 samba-d87b81fa303ee297685f4eb5599010901ed68145.zip | |
build: Move nfs4acl to the top level
This is to create IDL-stored NFSv4 ACLs, just as we use for posix ACLs
to permit better testing.
Andrew Bartlett
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/idl/nfs4acl.idl | 42 | ||||
| -rw-r--r-- | source4/librpc/idl/wscript_build | 2 | ||||
| -rwxr-xr-x | source4/librpc/wscript_build | 7 |
3 files changed, 1 insertions, 50 deletions
diff --git a/source4/librpc/idl/nfs4acl.idl b/source4/librpc/idl/nfs4acl.idl deleted file mode 100644 index 3d4379ad5e..0000000000 --- a/source4/librpc/idl/nfs4acl.idl +++ /dev/null @@ -1,42 +0,0 @@ -#include "idl_types.h" - -/* - NFS4 ACL format on disk - see http://www.suse.de/~agruen/nfs4acl/ -*/ - -import "misc.idl", "security.idl"; - -[ uuid("18763978-8625-abc3-54ca-9892bacdf321"), - version(1.0), - pointer_default(unique) -] -interface nfs4acl -{ - const char *NFS4ACL_XATTR_NAME = "system.nfs4acl"; - - /* these structures use the same bit values and other constants as - in security.idl */ - typedef [flag(NDR_BIG_ENDIAN)] struct { - uint16 e_type; - uint16 e_flags; - uint32 e_mask; - uint32 e_id; - utf8string e_who; - [flag(NDR_ALIGN4)] DATA_BLOB _pad; - } nfs4ace; - - typedef [public,flag(NDR_BIG_ENDIAN)] struct { - uint8 a_version; - uint8 a_flags; - uint16 a_count; - uint32 a_owner_mask; - uint32 a_group_mask; - uint32 a_other_mask; - nfs4ace ace[a_count]; - } nfs4acl; - - NTSTATUS nfs4acl_test( - [in] nfs4acl acl - ); -} diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build index 59b16766ea..7e54e8dfa4 100644 --- a/source4/librpc/idl/wscript_build +++ b/source4/librpc/idl/wscript_build @@ -5,7 +5,7 @@ import os topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl') bld.SAMBA_PIDL_LIST('PIDL', - source='''irpc.idl nfs4acl.idl ntp_signd.idl + source='''irpc.idl ntp_signd.idl opendb.idl sasl_helpers.idl winbind.idl winsif.idl winsrepl.idl winstation.idl''', options="--includedir=%s --header --ndr-parser --client --python --server" % topinclude, diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index c53acef44d..f49c30dbe3 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -24,13 +24,6 @@ bld.SAMBA_SUBSYSTEM('NDR_SASL_HELPERS', -bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL', - source='gen_ndr/ndr_nfs4acl.c', - public_deps='ndr NDR_SECURITY' - ) - - - bld.SAMBA_SUBSYSTEM('NDR_WINSIF', source='gen_ndr/ndr_winsif.c', public_deps='ndr' |