From 625ad345f0b644cc1b983caa06f67514c8edc874 Mon Sep 17 00:00:00 2001
From: Brennan Lamoreaux <blamoreaux@vmware.com>
Date: Tue, 14 Feb 2023 20:31:49 +0000
Subject: [PATCH] rename dcerpc to smbdcerpc 4.17.5
rename libdcerpc.so to libsmbdcerpc.so to avoid conflicts with libdcerpc.so from DCERPC.
Regenerated for samba 4.17.5
---
librpc/wscript_build | 2 +-
source4/dsdb/wscript_build | 2 +-
source4/lib/messaging/wscript_build | 2 +-
source4/lib/registry/wscript_build | 2 +-
source4/libcli/wscript_build | 2 +-
source4/libnet/wscript_build | 2 +-
source4/librpc/wscript_build | 12 ++++++------
source4/rpc_server/wscript_build | 2 +-
source4/torture/drs/wscript_build | 2 +-
source4/torture/wscript_build | 4 ++--
source4/wscript_build | 2 +-
11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 7913b7c..053ac23 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -727,7 +727,7 @@ bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
bld.SAMBA_SUBSYSTEM('RPC_NDR_WINBIND',
source='gen_ndr/ndr_winbind_c.c',
- public_deps='dcerpc NDR_WINBIND'
+ public_deps='smbdcerpc NDR_WINBIND'
)
bld.SAMBA_SUBSYSTEM('NDR_FSRVP_STATE',
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 7f9b8fe..6891579 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -77,7 +77,7 @@ bld.SAMBA_PYTHON('python_dsdb',
# the dependency on dcerpc here is because gensec
# depends on dcerpc but the waf circular dependency finder
# removes it so we end up with unresolved symbols.
- deps='samdb %s dcerpc com_err %s %s dsdb_garbage_collect_tombstones scavenge_dns_records' %\
+ deps='samdb %s smbdcerpc com_err %s %s dsdb_garbage_collect_tombstones scavenge_dns_records' %\
(pyldb_util, pyrpc_util, pyparam_util),
realname='samba/dsdb.so'
)
diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build
index 3408396..a85da70 100644
--- a/source4/lib/messaging/wscript_build
+++ b/source4/lib/messaging/wscript_build
@@ -15,7 +15,7 @@ bld.SAMBA_LIBRARY('MESSAGING',
UNIX_PRIVS
cluster
ndr
- dcerpc
+ smbdcerpc
messages_util
server_id_db
talloc_report_printf
diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build
index 2e01e43..d3c8968 100644
--- a/source4/lib/registry/wscript_build
+++ b/source4/lib/registry/wscript_build
@@ -12,7 +12,7 @@ bld.SAMBA_SUBSYSTEM('TDR_REGF',
bld.SAMBA_LIBRARY('registry',
source='interface.c util.c samba.c patchfile_dotreg.c patchfile_preg.c patchfile.c regf.c hive.c local.c ldb.c rpc.c',
- public_deps='dcerpc samba-util TDR_REGF ldb RPC_NDR_WINREG ldbsamba util_reg',
+ public_deps='smbdcerpc samba-util TDR_REGF ldb RPC_NDR_WINREG ldbsamba util_reg',
private_headers='registry.h',
private_library=True
)
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index f1bb6bd..c0b70cd 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -12,7 +12,7 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA_TSOCKET',
bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
source='util/clilsa.c',
autoproto='util/clilsa.h',
- public_deps='RPC_NDR_LSA dcerpc',
+ public_deps='RPC_NDR_LSA smbdcerpc',
deps='samba-security'
)
diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
index 0ec06f2..b55d725 100644
--- a/source4/libnet/wscript_build
+++ b/source4/libnet/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY(name,
source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c',
autoproto=auto_proto,
deps='INIT_SAMR',
- public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser %s LIBCLI_SAMSYNC LIBTSOCKET GNUTLS_HELPERS' % (provision),
+ public_deps='samba-credentials smbdcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser %s LIBCLI_SAMSYNC LIBTSOCKET GNUTLS_HELPERS' % (provision),
private_library=True,
pyembed=True,
enabled=bld.PYTHON_BUILD_IS_ENABLED()
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 5192d9b..5ea7b2a 100644
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -139,20 +139,20 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
bld.SAMBA_SUBSYSTEM('RPC_NDR_IRPC',
source='gen_ndr/ndr_irpc_c.c',
- public_deps='dcerpc NDR_IRPC'
+ public_deps='smbdcerpc NDR_IRPC'
)
bld.SAMBA_LIBRARY('dcerpc-samr',
source='',
pc_files='dcerpc_samr.pc',
vnum='0.0.1',
- public_deps='dcerpc ndr-standard RPC_NDR_SAMR',
+ public_deps='smbdcerpc ndr-standard RPC_NDR_SAMR',
public_headers='../../librpc/gen_ndr/ndr_samr_c.h',
header_path='gen_ndr'
)
-bld.SAMBA_LIBRARY('dcerpc',
+bld.SAMBA_LIBRARY('smbdcerpc',
source='''rpc/dcerpc.c rpc/dcerpc_auth.c rpc/dcerpc_schannel.c
rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_sock.c
rpc/dcerpc_roh_channel_in.c rpc/dcerpc_roh_channel_out.c rpc/dcerpc_roh.c
@@ -202,7 +202,7 @@ pyparam_util = bld.pyembed_libname('pyparam_util')
bld.SAMBA_SUBSYSTEM(pyrpc_util,
source='rpc/pyrpc_util.c',
- public_deps='%s %s dcerpc MESSAGING' % (pytalloc_util, pyparam_util),
+ public_deps='%s %s smbdcerpc MESSAGING' % (pytalloc_util, pyparam_util),
pyext=True,
enabled=bld.PYTHON_BUILD_IS_ENABLED(),
)
@@ -354,7 +354,7 @@ bld.SAMBA_PYTHON('python_initshutdown',
bld.SAMBA_PYTHON('python_epmapper',
source='../../librpc/gen_ndr/py_epmapper.c',
- deps='dcerpc %s %s' % (pytalloc_util, pyrpc_util),
+ deps='smbdcerpc %s %s' % (pytalloc_util, pyrpc_util),
realname='samba/dcerpc/epmapper.so',
cflags_end=gen_cflags
)
@@ -362,7 +362,7 @@ bld.SAMBA_PYTHON('python_epmapper',
bld.SAMBA_PYTHON('python_mgmt',
source='../../librpc/gen_ndr/py_mgmt.c',
- deps='dcerpc %s %s' % (pytalloc_util, pyrpc_util),
+ deps='smbdcerpc %s %s' % (pytalloc_util, pyrpc_util),
realname='samba/dcerpc/mgmt.so',
cflags_end=gen_cflags
)
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 0e44a3c..ac3a741 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -22,7 +22,7 @@ bld.SAMBA_LIBRARY('dcerpc_server',
source='dcerpc_server.c',
pc_files='dcerpc_server.pc',
deps='LIBCLI_AUTH ndr samba_server_gensec service auth',
- public_deps='dcerpc dcerpc-server-core',
+ public_deps='smbdcerpc dcerpc-server-core',
autoproto='dcerpc_server_proto.h',
public_headers='dcerpc_server.h',
vnum='0.0.1',
diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index 0dc26d6..f50ef6b 100644
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_MODULE('TORTURE_DRS',
autoproto='proto.h',
subsystem='smbtorture',
init_function='torture_drs_init',
- deps='samba-util ldb samba-errors torture ldbsamba talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS asn1util samdb NDR_DRSBLOBS samba-credentials samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain',
+ deps='samba-util ldb samba-errors torture ldbsamba talloc smbdcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS asn1util samdb NDR_DRSBLOBS samba-credentials samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain',
internal_module=True,
enabled=bld.PYTHON_BUILD_IS_ENABLED()
)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index d870a3a..8b41ad7 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -317,7 +317,7 @@ TORTURE_MODULES = 'TORTURE_BASIC TORTURE_RAW torture_rpc TORTURE_RAP TORTURE_AUT
bld.SAMBA_SUBSYSTEM('torturemain',
source='smbtorture.c torture.c shell.c',
subsystem_name='smbtorture',
- deps='torture dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
+ deps='torture smbdcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
enabled=bld.PYTHON_BUILD_IS_ENABLED()
)
@@ -325,7 +325,7 @@ bld.SAMBA_BINARY('smbtorture',
source=[],
manpages='man/smbtorture.1',
private_headers='smbtorture.h',
- deps='torturemain torture popt CMDLINE_S4 dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
+ deps='torturemain torture popt CMDLINE_S4 smbdcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
pyembed=True,
enabled=bld.PYTHON_BUILD_IS_ENABLED()
)
diff --git a/source4/wscript_build b/source4/wscript_build
index d204441..bf16575 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -2,7 +2,7 @@
bld.SAMBA_BINARY('client/smbclient' + bld.env.suffix4,
source='client/client.c',
- deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA CMDLINE_S4 smbclient-raw dcerpc',
+ deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA CMDLINE_S4 smbclient-raw smbdcerpc',
install=False
)
--
2.35.5