1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

s3:lib: Merge library trusts_util into library ads

Function trust_pw_change() originally from library trustis_util was updated
to call functionality from ads library. This would introduce circular
dependency between the two libraries. To avoid it, trusts_util is merged
into ads.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=6750

Signed-off-by: Pavel Filipenský <pfilipen@redhat.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Pavel Filipenský 2021-06-02 15:20:46 +02:00 committed by Pavel Filipensky
parent 07c0afe91d
commit 3de8d29415
4 changed files with 5 additions and 12 deletions

View File

@ -34,7 +34,7 @@ bld.SAMBA3_BINARY('rpcclient',
ndr-standard
msrpc3
SMBREADLINE
trusts_util
ads
RPC_NDR_WINREG
RPC_NDR_ECHO
RPC_CLIENT_SCHANNEL

View File

@ -271,7 +271,6 @@ bld.SAMBA3_BINARY('net',
RPC_NDR_DSSETUP
RPC_NDR_INITSHUTDOWN
printing_migrate
trusts_util
IDMAP_AUTORID_TDB
CONN_TDB
jansson

View File

@ -515,6 +515,7 @@ bld.SAMBA3_LIBRARY('ads',
libads/ldap_schema.c
libads/util.c
libads/net_ads_setspn.c
libads/trusts_util.c
''',
deps='''
cli-ldap-common
@ -528,7 +529,9 @@ bld.SAMBA3_LIBRARY('ads',
libsmb
DCUTIL
smbldap
trusts_util
libcli_netlogon3
msrpc3
samba-passdb
NDR_ADS
''',
private_library=True)
@ -980,15 +983,6 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL',
libcli_lsa3
''')
bld.SAMBA3_LIBRARY('trusts_util',
source='libsmb/trusts_util.c',
deps='''
libcli_netlogon3
msrpc3
samba-passdb
''',
private_library=True)
bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
source='lib/util_tdb.c',
deps='talloc samba3-util')