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>

diff --git a/source3/libsmb/trusts_util.c b/source3/libads/trusts_util.c
similarity index 100%
rename from source3/libsmb/trusts_util.c
rename to source3/libads/trusts_util.c

diff --git a/source3/rpcclient/wscript_build b/source3/rpcclient/wscript_build
index bb3a88cd4018a3943203f6d102ed813278f5fcb2..7545831db0d6d7c243b7ea4b75878d17b1018c6a 100644 (file)
--- a/source3/rpcclient/wscript_build
+++ b/source3/rpcclient/wscript_build
@@ -34,7 +34,7 @@ bld.SAMBA3_BINARY('rpcclient',
                  ndr-standard
                  msrpc3
                  SMBREADLINE
-                 trusts_util
+                 ads
                  RPC_NDR_WINREG
                  RPC_NDR_ECHO
                  RPC_CLIENT_SCHANNEL

diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
index e486af0ac6d69f89fb70ea58b9c800033f982850..85deb74eab6955c9dc1bb551d26f744bfb04f869 100644 (file)
--- a/source3/utils/wscript_build
+++ b/source3/utils/wscript_build
@@ -271,7 +271,6 @@ bld.SAMBA3_BINARY('net',
                  RPC_NDR_DSSETUP
                  RPC_NDR_INITSHUTDOWN
                  printing_migrate
-                 trusts_util
                  IDMAP_AUTORID_TDB
                  CONN_TDB
                  jansson

diff --git a/source3/wscript_build b/source3/wscript_build
index 1e24d136584c6bc270fd8da9c128aab19fa5903b..824f961c1ecd55e234a2fd811853c8e0a65347ff 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -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')