librpc: Move winstation.idl to the top level and exclude from fuzzing

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Dec 18 08:05:05 UTC 2019 on sn-devel-184

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

diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index 830308491dac717bc89d8ff5a1092524d89055bc..b66f27be901e2113994efe7e8c1d7f6ee3676f0d 100644 (file)
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -92,6 +92,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
                     scerpc.idl
                     trkwks.idl
                     w32time.idl
+                    winstation.idl
                     wzcsvc.idl
                     ''',
                     options='--header --ndr-parser',

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 50cbed7e8242150b5298045b7cfbf98ca2fb4dc2..5eb78e6010a8273c3f2dfb3139e3493bd1a78607 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -449,6 +449,11 @@ bld.SAMBA_SUBSYSTEM('NDR_MESSAGING',
     public_deps='ndr NDR_SERVER_ID'
     )
 
+bld.SAMBA_SUBSYSTEM('NDR_WINSTATION',
+       source='gen_ndr/ndr_winstation.c',
+       public_deps='ndr'
+       )
+
 bld.SAMBA_SUBSYSTEM('RPC_NDR_ATSVC',
     source='gen_ndr/ndr_atsvc_c.c',
     public_deps='dcerpc-binding NDR_ATSVC'

diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build
index f8dca6af4a764ecbfce4d2cabac81c0519aaa83e..58555e6bf55f70b52d6cf7d94474e33e9c8859c1 100644 (file)
--- a/source4/librpc/idl/wscript_build
+++ b/source4/librpc/idl/wscript_build
@@ -7,7 +7,7 @@ topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl')
 bld.SAMBA_PIDL_LIST('PIDL',
                    source='''ntp_signd.idl
                               opendb.idl sasl_helpers.idl
-                              winsif.idl winsrepl.idl winstation.idl''',
+                              winsif.idl winsrepl.idl''',
                     options="--includedir=%s --header --ndr-parser" % topinclude,
                     output_dir='../gen_ndr')
 

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index c0ba7613273f17ec74da663d143604acb018bb8e..009b2e13d2e5f31a3bbe08703ba015354f02929b 100644 (file)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -5,12 +5,6 @@ bld.RECURSE('../../librpc/tools')
 bld.RECURSE('idl')
 
 
-bld.SAMBA_SUBSYSTEM('NDR_WINSTATION',
-       source='gen_ndr/ndr_winstation.c',
-       public_deps='ndr'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('NDR_IRPC',
        source='gen_ndr/ndr_irpc.c',
        public_deps='ndr NDR_SECURITY ndr_nbt'