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>

diff --git a/source4/librpc/idl/nfs4acl.idl b/librpc/idl/nfs4acl.idl
similarity index 100%
rename from source4/librpc/idl/nfs4acl.idl
rename to librpc/idl/nfs4acl.idl

diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index 2dbf1a3f8392ea9646359fc6290bdfa070707f0b..854a2e2e96bbe6dc985f4eb51ed34462d3b81e27 100644 (file)
--- 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 8a4c169d5af3f07ad12abe2f3c495120770547b0..cc5d61727515075693b15b25d4491c5263ffbd43 100644 (file)
--- 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 59b16766ea5021140f6931bfbc6309aed9a87dcd..7e54e8dfa4e54a43d12444aad8b46095736208e8 100644 (file)
--- 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 c53acef44d8cf0397e3230076d0b19624570318c..f49c30dbe3064fe2e3956ba6343f68480ea0a0b0 100755 (executable)
--- 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'