diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-05-08 12:17:32 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-06-11 10:18:26 +0200 |
| commit | f4ab082d2b984b7deb3afbc7a26e238aa5b3b8c3 (patch) | |
| tree | 7c8cfead272ce18d074a6f47edc12d748cb6c241 /source4/librpc | |
| parent | 223fbdaf3872fe71a75fec62813b91612af73a2b (diff) | |
| download | samba-f4ab082d2b984b7deb3afbc7a26e238aa5b3b8c3.tar.gz | |
librpc/idl: Merge wbint.idl with winbind.idl so we can forward IRPC requests to internal winbind calls
Change-Id: Iba3913d5a1c7f851b93f37e9beb6dbb20fbf7e55
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/idl/wscript_build | 2 | ||||
| -rwxr-xr-x | source4/librpc/wscript_build | 15 |
2 files changed, 3 insertions, 14 deletions
diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build index 7e54e8dfa4e..6e3e36a6a6b 100644 --- a/source4/librpc/idl/wscript_build +++ b/source4/librpc/idl/wscript_build @@ -6,7 +6,7 @@ topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl') bld.SAMBA_PIDL_LIST('PIDL', source='''irpc.idl ntp_signd.idl - opendb.idl sasl_helpers.idl winbind.idl + opendb.idl sasl_helpers.idl winsif.idl winsrepl.idl winstation.idl''', options="--includedir=%s --header --ndr-parser --client --python --server" % topinclude, output_dir='../gen_ndr') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 949622b58ae..582092d5142 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -51,11 +51,6 @@ bld.SAMBA_SUBSYSTEM('NDR_WINSREPL', ) -bld.SAMBA_SUBSYSTEM('NDR_WINBIND', - source='gen_ndr/ndr_winbind.c', - public_deps='NDR_IDMAP ndr ndr-standard' - ) - # create a grouping library to consolidate our samba4 specific NDR code bld.SAMBA_LIBRARY('ndr-samba4', source=[], @@ -87,7 +82,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table', 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 NDR_WBINT''', + NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG''', depends_on='GEN_NDR_TABLES' ) @@ -97,12 +92,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_IRPC', public_deps='dcerpc NDR_IRPC' ) -bld.SAMBA_SUBSYSTEM('RPC_NDR_WINBIND', - source='gen_ndr/ndr_winbind_c.c', - public_deps='dcerpc NDR_WINBIND' - ) - - bld.SAMBA_LIBRARY('dcerpc-samr', source='', pc_files='dcerpc_samr.pc', @@ -305,7 +294,7 @@ bld.SAMBA_PYTHON('python_server_id', ) bld.SAMBA_PYTHON('python_winbind', - source='gen_ndr/py_winbind.c', + source='../../librpc/gen_ndr/py_winbind.c', deps='RPC_NDR_WINBIND pytalloc-util pyrpc_util python_netlogon', realname='samba/dcerpc/winbind.so' ) |