git.samba.org / kai / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
pymessaging: Use the server_id IDL structure rather than a tuple
[kai/samba.git] / source4 / librpc / wscript_build
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 0d6589ec80f658ff9d9a2fa49451a642e105607d..c53acef44d8cf0397e3230076d0b19624570318c 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -4,13 +4,6 @@ bld.RECURSE('../../librpc/idl')
 bld.RECURSE('../../librpc/tools')
 bld.RECURSE('idl')
 
-bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID4',
-       source='gen_ndr/ndr_server_id4.c',
-       deps='ndr',
-       public_headers='gen_ndr/server_id4.h',
-       header_path='gen_ndr'
-       )
-
 
 bld.SAMBA_SUBSYSTEM('NDR_WINSTATION',
        source='gen_ndr/ndr_winstation.c',
@@ -20,7 +13,7 @@ bld.SAMBA_SUBSYSTEM('NDR_WINSTATION',
 
 bld.SAMBA_SUBSYSTEM('NDR_IRPC',
        source='gen_ndr/ndr_irpc.c',
-       public_deps='ndr NDR_SECURITY NDR_NBT'
+       public_deps='ndr NDR_SECURITY ndr_nbt'
        )
 
 
@@ -50,12 +43,6 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB',
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
-       source='gen_ndr/ndr_s4_notify.c',
-       public_deps='ndr NDR_SERVER_ID4'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('NDR_NTP_SIGND',
        source='gen_ndr/ndr_ntp_signd.c',
        public_deps='ndr'
@@ -64,7 +51,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NTP_SIGND',
 
 bld.SAMBA_SUBSYSTEM('NDR_WINSREPL',
        source='gen_ndr/ndr_winsrepl.c',
-       public_deps='ndr NDR_NBT'
+       public_deps='ndr ndr_nbt'
        )
 
 
@@ -76,7 +63,7 @@ bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
 # create a grouping library to consolidate our samba4 specific NDR code
 bld.SAMBA_LIBRARY('ndr-samba4',
        source=[],
-       deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB NDR_NOTIFY ndr-table',
+       deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB ndr-table',
        private_library=True,
        grouping_library=True
        )
@@ -92,11 +79,6 @@ bld.SAMBA_LIBRARY('dcerpc-samba4',
 
 bld.SAMBA_PIDL_TABLES('GEN_NDR_TABLES', 'gen_ndr/tables.c')
 
-if bld.env.enable_s3build:
-    s3_ndr = "NDR_WBINT"
-else:
-    s3_ndr = ""
-
 bld.SAMBA_SUBSYSTEM('ndr-table',
        source='../../librpc/ndr/ndr_table.c gen_ndr/tables.c',
         public_deps='''ndr-standard NDR_AUDIOSRV NDR_DSBACKUP NDR_EFS
@@ -104,12 +86,12 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
         NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINSIF NDR_MGMT
         NDR_OXIDRESOLVER NDR_REMACT NDR_WZCSVC
         NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_TRKWKS NDR_KEYSVC ndr-krb5pac
-        NDR_XATTR NDR_SCHANNEL NDR_ROT NDR_DRSBLOBS NDR_NBT NDR_WINSREPL
+        NDR_XATTR NDR_SCHANNEL NDR_ROT NDR_DRSBLOBS ndr_nbt NDR_WINSREPL
         NDR_SECURITY NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_OPENDB
         NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI
         NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI
         NDR_NAMED_PIPE_AUTH NDR_NTLMSSP NDR_DFSBLOBS NDR_DNSP
-        NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG ''' + s3_ndr,
+        NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG NDR_WBINT''',
         depends_on='GEN_NDR_TABLES'
         )
 
@@ -156,10 +138,13 @@ bld.SAMBA_LIBRARY('dcerpc',
        rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c
        rpc/dcerpc_connect.c rpc/dcerpc_secondary.c''',
        pc_files='dcerpc.pc',
-       deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE UTIL_TEVENT rpccommon',
+       deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH smbclient-raw LP_RESOLVE tevent-util dcerpc-binding param_options',
        autoproto='rpc/dcerpc_proto.h',
-       public_deps='credentials tevent talloc',
-       public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h',
+       public_deps='samba-credentials tevent talloc',
+       public_headers='''rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h
+       ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h
+       ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h
+       ../../librpc/gen_ndr/ndr_epmapper_c.h''',
        # It's very important to keep this form of construction
        # it force the sambawaf extension to put everything that match the first element
        # (*gen_ndr*) into the dir named by the second element (gen_ndr).
@@ -173,14 +158,14 @@ bld.SAMBA_LIBRARY('dcerpc',
 
 bld.SAMBA_SUBSYSTEM('pyrpc_util',
        source='rpc/pyrpc_util.c',
-       public_deps='pytalloc-util pyparam_util dcerpc',
+       public_deps='pytalloc-util pyparam_util dcerpc MESSAGING',
        pyext=True,
        )
 
 
 bld.SAMBA_PYTHON('python_dcerpc',
        source='rpc/pyrpc.c',
-       public_deps='LIBCLI_SMB samba-util samba-hostconfig dcerpc-samr RPC_NDR_LSA DYNCONFIG pyrpc_util',
+       public_deps='LIBCLI_SMB samba-util samba-hostconfig dcerpc-samr RPC_NDR_LSA DYNCONFIG pyrpc_util gensec',
        realname='samba/dcerpc/base.so'
        )
 
@@ -196,6 +181,23 @@ bld.SAMBA_PYTHON('python_echo',
        realname='samba/dcerpc/echo.so'
        )
 
+bld.SAMBA_PYTHON('python_dns',
+       source='../../librpc/gen_ndr/py_dns.c',
+       deps='RPC_NDR_DNS pytalloc-util pyrpc_util',
+       realname='samba/dcerpc/dns.so'
+       )
+
+bld.SAMBA_PYTHON('python_auth',
+       source='../../librpc/gen_ndr/py_auth.c',
+       deps='NDR_AUTH pytalloc-util pyrpc_util',
+       realname='samba/dcerpc/auth.so'
+       )
+
+bld.SAMBA_PYTHON('python_krb5pac',
+       source='../../librpc/gen_ndr/py_krb5pac.c',
+       deps='ndr-krb5pac pytalloc-util pyrpc_util',
+       realname='samba/dcerpc/krb5pac.so'
+       )
 
 bld.SAMBA_PYTHON('python_winreg',
        source='../../librpc/gen_ndr/py_winreg.c',
@@ -241,7 +243,7 @@ bld.SAMBA_PYTHON('python_atsvc',
 
 bld.SAMBA_PYTHON('python_dcerpc_nbt',
        source='../../librpc/gen_ndr/py_nbt.c',
-       deps='NDR_NBT RPC_NDR_NBT pytalloc-util pyrpc_util',
+       deps='ndr_nbt RPC_NDR_NBT pytalloc-util pyrpc_util',
        realname='samba/dcerpc/nbt.so'
        )
 
@@ -294,6 +296,12 @@ bld.SAMBA_PYTHON('python_irpc',
        realname='samba/dcerpc/irpc.so'
        )
 
+bld.SAMBA_PYTHON('python_server_id',
+       source='../../librpc/gen_ndr/py_server_id.c',
+       deps='RPC_NDR_SERVER_ID pytalloc-util pyrpc_util',
+       realname='samba/dcerpc/server_id.so'
+       )
+
 bld.SAMBA_PYTHON('python_winbind',
        source='gen_ndr/py_winbind.c',
        deps='RPC_NDR_WINBIND pytalloc-util pyrpc_util python_netlogon',
@@ -338,12 +346,30 @@ bld.SAMBA_PYTHON('python_dcerpc_xattr',
        realname='samba/dcerpc/xattr.so'
        )
 
+bld.SAMBA_PYTHON('python_dcerpc_idmap',
+       source='../../librpc/gen_ndr/py_idmap.c',
+       deps='pytalloc-util pyrpc_util RPC_NDR_XATTR',
+       realname='samba/dcerpc/idmap.so'
+       )
+
 bld.SAMBA_PYTHON('python_netlogon',
        source='../../librpc/gen_ndr/py_netlogon.c',
        deps='RPC_NDR_NETLOGON pytalloc-util pyrpc_util',
        realname='samba/dcerpc/netlogon.so'
        )
 
+bld.SAMBA_PYTHON('python_dnsserver',
+       source='../../librpc/gen_ndr/py_dnsserver.c',
+       deps='RPC_NDR_DNSSERVER pytalloc-util pyrpc_util',
+       realname='samba/dcerpc/dnsserver.so'
+       )
+
+bld.SAMBA_PYTHON('python_dcerpc_smb_acl',
+       source='../../librpc/gen_ndr/py_smb_acl.c',
+       deps='pytalloc-util pyrpc_util',
+       realname='samba/dcerpc/smb_acl.so'
+       )
+
 bld.SAMBA_SCRIPT('python_dcerpc_init',
                  pattern='rpc/dcerpc.py',
                  installdir='python/samba/dcerpc',
Kai's WIP code