Don't generate an interface table for nfs4acls.idl

[Ralph Böhme]

On Fri, Oct 27, 2017 at 04:53:39PM +1300, Andrew Bartlett wrote:
> On Tue, 2017-10-24 at 09:53 +0200, Ralph Böhme wrote:
> > On Mon, Oct 23, 2017 at 10:19:42PM +0000, Andrew Bartlett wrote:
> > > On Thu, 2017-10-19 at 22:57 +0200, Ralph Böhme via samba-technical
> > > wrote:
> > > > Nobody uses the function nfs4acl_test.
> > > 
> > > The reason why these functions are created is to allow manual
> > > parsing
> > > of the blobs with ndrdump.  This is helpful during development. 
> > > 
> > > It would be a good idea to separate the need to parse blobs from
> > > full
> > > interface generation if we wish to continue down this track. 
> > 
> > oh, sorry for fogetting about that. Now that you mention it I
> > remember
> > struggling with exactly this issue on mdssvc.idl.
> > 
> > Shall we revert? Or just leave it as it and bring it back when
> > needed?
> 
> I know it is a dirty word in Samba, but a revert might be best until
> someone writes a 'struct' mode for ndrdump.

revert attached. Please review & push. Thanks!

-slow

-- 
Ralph Boehme, Samba Team       https://samba.org/
Samba Developer, SerNet GmbH   https://sernet.de/en/samba/
-------------- next part --------------
From 385923f546276af89655e5a182a87f746bc590cd Mon Sep 17 00:00:00 2001
From: Ralph Boehme <slow at samba.org>
Date: Sat, 28 Oct 2017 19:20:50 +0200
Subject: [PATCH] Revert "nfs4acls: Don't generate an interface table for
 nfs4acls.idl"

This reverts commit 0bd5d7bcbeebed9308bedf5c3854be37d9d33f72.

Do generate interface table. The reason why these functions are created is
to allow manual parsing of the blobs with ndrdump.

Signed-off-by: Ralph Boehme <slow at samba.org>
---
 librpc/idl/nfs4acl.idl       | 6 +++++-
 librpc/idl/wscript_build     | 3 +--
 source4/librpc/wscript_build | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/librpc/idl/nfs4acl.idl b/librpc/idl/nfs4acl.idl
index 5a3d0268f21..13a6d131dcf 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,4 +39,8 @@ 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 75eba7d54a5..1ea15371e8c 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -37,13 +37,12 @@ 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',
+		    'dnsp.idl nfs4acl.idl',
                     options='--header --ndr-parser --client --python',
                     output_dir='../gen_ndr')
 
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index eed0551824b..1d2b6c09678 100644
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -109,6 +109,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
                     NDR_FRSRPC
                     NDR_FRSAPI
                     NDR_FRSTRANS
+                    NDR_NFS4ACL
                     NDR_NTP_SIGND
                     NDR_DCOM
                     NDR_WMI
-- 
2.13.6