s4:dsdb: Move cldap netlogon functions into samdb/ldb_modules

As netlogon is handled by the samdb now,
the corresponding functions should live there as well.

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@symas.com>

10 files changed, 10 insertions, 34 deletions

diff --git a/source4/cldap_server/cldap_server.h b/source4/cldap_server/cldap_server.h
index 995ceed3a22..07252846f6f 100644
--- a/source4/cldap_server/cldap_server.h
+++ b/source4/cldap_server/cldap_server.h
@@ -32,30 +32,4 @@ struct cldapd_server {
 
 struct ldap_SearchRequest;
 
-/* used by netlogon DCE/RPC server */
-NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx,
-                                         TALLOC_CTX *mem_ctx,
-                                         const char *domain,
-                                         const char *netbios_domain,
-                                         struct dom_sid *domain_sid,
-                                         const char *domain_guid,
-                                         const char *user,
-                                         uint32_t acct_control,
-                                         const char *src_address,
-                                         uint32_t version,
-                                         struct loadparm_context *lp_ctx,
-                                         struct netlogon_samlogon_response *netlogon,
-					 bool fill_on_blank_request);
-
-NTSTATUS parse_netlogon_request(struct ldb_parse_tree *tree,
-				struct loadparm_context *lp_ctx,
-				TALLOC_CTX *mem_ctx,
-				const char **domain,
-				const char **host,
-				const char **user,
-				const char **domain_guid,
-				struct dom_sid **domain_sid,
-				int *acct_control,
-				int *version);
-
 #include "cldap_server/proto.h"
diff --git a/source4/cldap_server/wscript_build b/source4/cldap_server/wscript_build
index 6ffdb4a6bd5..928b91b1249 100644
--- a/source4/cldap_server/wscript_build
+++ b/source4/cldap_server/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_MODULE('service_cldap',
 
 
 bld.SAMBA_SUBSYSTEM('CLDAPD',
-	source='netlogon.c rootdse.c',
+	source='rootdse.c',
 	autoproto='proto.h',
 	deps='cli_cldap ldbsamba'
 	)
diff --git a/source4/cldap_server/netlogon.c b/source4/dsdb/samdb/ldb_modules/netlogon.c
index 231bd169e9a..a381da833cf 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/dsdb/samdb/ldb_modules/netlogon.c
@@ -25,11 +25,11 @@
 #include <ldb_errors.h>
 #include "lib/events/events.h"
 #include "smbd/service_task.h"
-#include "cldap_server/cldap_server.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "libcli/ldap/ldap_ndr.h"
 #include "libcli/security/security.h"
 #include "dsdb/samdb/samdb.h"
+#include "dsdb/samdb/ldb_modules/util.h"
 #include "auth/auth.h"
 #include "ldb_wrap.h"
 #include "system/network.h"
diff --git a/source4/dsdb/samdb/ldb_modules/util.h b/source4/dsdb/samdb/ldb_modules/util.h
index c21304213a8..e40730557a3 100644
--- a/source4/dsdb/samdb/ldb_modules/util.h
+++ b/source4/dsdb/samdb/ldb_modules/util.h
@@ -25,10 +25,12 @@ struct dsdb_attribute;
 struct dsdb_fsmo_extended_op;
 struct security_descriptor;
 struct dom_sid;
+struct netlogon_samlogon_response;
 
 #include "librpc/gen_ndr/misc.h"
 #include "dsdb/samdb/ldb_modules/util_proto.h"
 #include "dsdb/common/util.h"
+#include "../libcli/netlogon/netlogon.h"
 
 /* extend the dsdb_request_add_controls() flags for module
    specific functions */
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 7e45c600fb2..0df5fe03fff 100755
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -7,7 +7,7 @@ bld.SAMBA_LIBRARY('dsdb-module',
 	grouping_library=True)
 
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
-	source='util.c acl_util.c schema_util.c',
+	source='util.c acl_util.c schema_util.c netlogon.c',
 	autoproto='util_proto.h',
 	deps='ldb ndr samdb-common samba-security'
 	)
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build_server b/source4/dsdb/samdb/ldb_modules/wscript_build_server
index 7ad1d3b87d5..41eb0f34e16 100755
--- a/source4/dsdb/samdb/ldb_modules/wscript_build_server
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build_server
@@ -106,7 +106,7 @@ bld.SAMBA_MODULE('ldb_rootdse',
 	init_function='ldb_rootdse_module_init',
 	module_init_name='ldb_init_module',
 	internal_module=False,
-	deps='talloc samdb MESSAGING samba-security DSDB_MODULE_HELPERS RPC_NDR_IRPC CLDAPD'
+	deps='talloc samdb MESSAGING samba-security DSDB_MODULE_HELPERS RPC_NDR_IRPC'
 	)
 
 
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index 3f0fa542fea..0e5294cb94c 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -28,7 +28,7 @@
 #include "auth/auth.h"
 #include "param/param.h"
 #include "smbd/service_task.h"
-#include "cldap_server/cldap_server.h"
+#include "dsdb/samdb/ldb_modules/util.h"
 #include "libcli/security/security.h"
 #include "nbt_server/dgram/proto.h"
 
diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build
index 665ccd46c2e..9d0c24a14e2 100644
--- a/source4/nbt_server/wscript_build
+++ b/source4/nbt_server/wscript_build
@@ -30,7 +30,7 @@ bld.SAMBA_SUBSYSTEM('NBTD_WINS',
 bld.SAMBA_SUBSYSTEM('NBTD_DGRAM',
 	source='dgram/request.c dgram/netlogon.c dgram/browse.c',
 	autoproto='dgram/proto.h',
-	deps='LIBCLI_DGRAM CLDAPD',
+	deps='LIBCLI_DGRAM DSDB_MODULE_HELPERS',
 	enabled=bld.AD_DC_BUILD_IS_ENABLED()
 	)
 
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index de8f0e5ac0a..7329930163a 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -33,7 +33,7 @@
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc_c.h"
 #include "../libcli/ldap/ldap_ndr.h"
-#include "cldap_server/cldap_server.h"
+#include "dsdb/samdb/ldb_modules/util.h"
 #include "lib/tsocket/tsocket.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index cc8efdb1b58..2907f008c71 100755
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -96,7 +96,7 @@ bld.SAMBA_MODULE('dcerpc_netlogon',
 	source='netlogon/dcerpc_netlogon.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_netlogon_init',
-	deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNEL ndr-standard auth4_sam samba-hostconfig CLDAPD'
+	deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNEL ndr-standard auth4_sam samba-hostconfig DSDB_MODULE_HELPERS'
 	)