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 | |
| 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>
| -rw-r--r-- | librpc/idl/nfs4acl.idl (renamed from source4/librpc/idl/nfs4acl.idl) | 0 | ||||
| -rw-r--r-- | librpc/idl/wscript_build | 2 | ||||
| -rw-r--r-- | librpc/wscript_build | 5 | ||||
| -rw-r--r-- | source4/librpc/idl/wscript_build | 2 | ||||
| -rwxr-xr-x | source4/librpc/wscript_build | 7 |
5 files changed, 7 insertions, 9 deletions
diff --git a/source4/librpc/idl/nfs4acl.idl b/librpc/idl/nfs4acl.idl index 3d4379ad5e..3d4379ad5e 100644 --- a/source4/librpc/idl/nfs4acl.idl +++ b/librpc/idl/nfs4acl.idl diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build index 2dbf1a3f83..854a2e2e96 100644 --- a/librpc/idl/wscript_build +++ b/librpc/idl/wscript_build @@ -32,6 +32,6 @@ bld.SAMBA_PIDL_LIST('PIDL', output_dir='../gen_ndr') bld.SAMBA_PIDL_LIST('PIDL', - 'dnsp.idl', + 'dnsp.idl nfs4acl.idl', options='--header --ndr-parser --client --python', output_dir='../gen_ndr') diff --git a/librpc/wscript_build b/librpc/wscript_build index 8a4c169d5a..cc5d617275 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -217,6 +217,11 @@ bld.SAMBA_SUBSYSTEM('NDR_DNSP', public_deps='ndr' ) +bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL', + source='gen_ndr/ndr_nfs4acl.c', + public_deps='ndr NDR_SECURITY' + ) + bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING', source='gen_ndr/ndr_ntprinting.c ndr/ndr_ntprinting.c', public_deps='ndr' 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' |