kcc: Move kcc/kcc_deleted.c into kcc/garbage_collect_tombstones.c
authorAndrew Bartlett <abartlet@samba.org>
Sun, 17 Jul 2016 23:53:50 +0000 (11:53 +1200)
committerGarming Sam <garming@samba.org>
Thu, 1 Sep 2016 03:49:14 +0000 (05:49 +0200)
This is in preperation for a python binding for this function

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
source4/dsdb/kcc/garbage_collect_tombstones.c [moved from source4/dsdb/kcc/kcc_deleted.c with 99% similarity]
source4/dsdb/kcc/kcc_service.h
source4/dsdb/wscript_build

similarity index 99%
rename from source4/dsdb/kcc/kcc_deleted.c
rename to source4/dsdb/kcc/garbage_collect_tombstones.c
index 93d74ca3a3d25cdf2158523d686c1ffbfbbd8db6..8b9e9216e4501404c544bc67961fdec6eb46c084 100644 (file)
@@ -110,7 +110,7 @@ NTSTATUS kccsrv_check_deleted(struct kccsrv_service *s, TALLOC_CTX *mem_ctx)
 
                if (ret != LDB_SUCCESS) {
                        DEBUG(1,(__location__ ": Failed to search for deleted objects in %s\n",
-                                ldb_dn_get_linearized(do_dn)));        
+                                ldb_dn_get_linearized(do_dn)));
                        TALLOC_FREE(tmp_ctx);
                        continue;
                }
index b3ba226e7261cb7c030b6f547402d944e2870aa0..451347ec81f5595b0d49fa62fd2458e14299d36d 100644 (file)
@@ -98,6 +98,8 @@ struct kccsrv_service {
 
 struct kcc_connection_list;
 
+NTSTATUS kccsrv_check_deleted(struct kccsrv_service *s, TALLOC_CTX *mem_ctx);
+
 #include "dsdb/kcc/kcc_service_proto.h"
 
 #endif /* _DSDB_REPL_KCC_SERVICE_H_ */
index 991f9d3478ffcc472eb4113e345719506b34a741..aea8fa43d71387c207908f321a9ddbc1c7ea24ba 100755 (executable)
@@ -37,13 +37,17 @@ bld.SAMBA_MODULE('service_drepl',
        enabled=bld.AD_DC_BUILD_IS_ENABLED()
        )
 
+bld.SAMBA_LIBRARY('dsdb_garbage_collect_tombstones',
+                  source='kcc/garbage_collect_tombstones.c',
+                  deps='samdb param RPC_NDR_DRSUAPI',
+                  private_library=True)
 
 bld.SAMBA_MODULE('service_kcc',
-       source='kcc/kcc_service.c kcc/kcc_connection.c kcc/kcc_topology.c kcc/kcc_deleted.c kcc/kcc_periodic.c kcc/kcc_drs_replica_info.c',
+       source='kcc/kcc_service.c kcc/kcc_connection.c kcc/kcc_topology.c kcc/kcc_periodic.c kcc/kcc_drs_replica_info.c',
        autoproto='kcc/kcc_service_proto.h',
        subsystem='service',
        init_function='server_service_kcc_init',
-       deps='samdb process_model RPC_NDR_IRPC RPC_NDR_DRSUAPI UTIL_RUNCMD',
+       deps='samdb process_model RPC_NDR_IRPC RPC_NDR_DRSUAPI UTIL_RUNCMD dsdb_garbage_collect_tombstones',
        internal_module=False,
        enabled=bld.AD_DC_BUILD_IS_ENABLED()
        )