s4-kdc: Migrate to tsocket_address.

[ira/wip.git] / source4 / kdc / kdc.h

diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h
index 0943de4b007251dd05897423eb7dcf076f76dbcb..4a715fd498af30d1cc77a6bf6f035567501d8e58 100644 (file)
--- a/source4/kdc/kdc.h
+++ b/source4/kdc/kdc.h
@@ -22,23 +22,22 @@
 
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "heimdal/kdc/kdc.h"
-#include "heimdal/lib/hdb/hdb.h"
-#include "heimdal/kdc/windc_plugin.h"
-#include "kdc/pac_glue.h"
+#include <hdb.h>
+#include <kdc.h>
+#include <krb5/windc_plugin.h>
+#include "kdc/pac-glue.h"
+#include "kdc/hdb-samba4.h"
 
 struct kdc_server;
-struct socket_address;
+struct tsocket_address;
 
-extern TALLOC_CTX *kdc_mem_ctx;
-extern struct loadparm_context *kdc_lp_ctx;
 
 bool kpasswdd_process(struct kdc_server *kdc,
                      TALLOC_CTX *mem_ctx, 
                      DATA_BLOB *input, 
                      DATA_BLOB *reply,
-                     struct socket_address *peer_addr, 
-                     struct socket_address *my_addr,
+                     struct tsocket_address *peer_addr,
+                     struct tsocket_address *my_addr,
                      int datagram_reply);
 
 /*
@@ -48,14 +47,7 @@ struct kdc_server {
        struct task_server *task;
        krb5_kdc_configuration *config;
        struct smb_krb5_context *smb_krb5_context;
+       struct hdb_samba4_context *hdb_samba4_context;
 };
 
 
-struct hdb_ldb_private {
-       struct ldb_context *samdb;
-       struct smb_iconv_convenience *iconv_convenience;
-       struct ldb_message *msg;
-       struct ldb_message *realm_ref_msg;
-       hdb_entry_ex *entry_ex;
-       const char *netbios_name;
-};