gpo: enable gpo update with addition to build system

Split from "Initial commit for GPO work done by Luke Morrison" by Garming Sam

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Luke Morrison <luke@hubtrek.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/wscript_build b/source3/wscript_build
index 8718e9b95587bcd37985d718ac217067ac6763aa..f13429d1ea02782ebf26d41f82a26dbae6a1d1ce 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -76,25 +76,6 @@ bld.SAMBA3_LIBRARY('msrpc3',
                    ''',
                    private_library=True)
 
                    ''',
                    private_library=True)
 

-bld.SAMBA3_LIBRARY('gpo',
-                   source='''
-                          ../libgpo/gpo_ldap.c
-                          ../libgpo/gpo_ini.c
-                          ../libgpo/gpo_util.c
-                          ../libgpo/gpo_fetch.c
-                          ../libgpo/gpo_filesync.c
-                          ../libgpo/gpo_sec.c
-                          ../libgpo/gpo_reg.c
-                          ''',
-                   deps='''
-                        talloc
-                        ads
-                        TOKEN_UTIL
-                        gpext
-                        auth
-                        ''',
-                   private_library=True)
-

 bld.SAMBA3_SUBSYSTEM('AVAHI',
                     source='''
                            lib/avahi.c
 bld.SAMBA3_SUBSYSTEM('AVAHI',
                     source='''
                            lib/avahi.c

diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 29c6f0e4a701f7be0cf1c650687974dd01e3ba81..328497c85906f498cf2c1b1d7d02d9ef8320ddaa 100644 (file)
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -62,6 +62,15 @@ bld.SAMBA_MODULE('service_dns_update',
        enabled=bld.AD_DC_BUILD_IS_ENABLED()
        )
 
        enabled=bld.AD_DC_BUILD_IS_ENABLED()
        )
 

+bld.SAMBA_MODULE('service_gpo_update',
+       source='gpo/gpo_update.c',
+       subsystem='service',
+       init_function='server_service_gpoupdate_init',
+       deps='samdb UTIL_RUNCMD samba-util ldb samdb-common samba-errors talloc auth_system_session samba-hostconfig',
+       internal_module=False,
+       enabled=bld.AD_DC_BUILD_IS_ENABLED()
+       )
+

 bld.SAMBA_PYTHON('python_dsdb',
        source='pydsdb.c',
        # the dependency on dcerpc here is because gensec
 bld.SAMBA_PYTHON('python_dsdb',
        source='pydsdb.c',
        # the dependency on dcerpc here is because gensec

diff --git a/wscript_build b/wscript_build
index 8758b6d57898d03fab14683b9a1dd485bf22f652..52f8de1c13b1e9d2948702b2f19e143d3a774447 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -87,6 +87,7 @@ bld.RECURSE('lib/tdr')
 bld.RECURSE('lib/tsocket')
 bld.RECURSE('lib/crypto')
 bld.RECURSE('lib/torture')
 bld.RECURSE('lib/tsocket')
 bld.RECURSE('lib/crypto')
 bld.RECURSE('lib/torture')

+bld.RECURSE('libgpo')

 bld.RECURSE('source4/lib/com')
 bld.RECURSE('source4/dns_server')
 bld.RECURSE('source4/echo_server')
 bld.RECURSE('source4/lib/com')
 bld.RECURSE('source4/dns_server')
 bld.RECURSE('source4/echo_server')