s4-kdc: Move definitions to kdc-server.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source4/kdc/kdc-glue.h b/source4/kdc/kdc-glue.h
index 7ba4bd3bfcbea7750da87792320d4e1c2ccb35d7..88e7463348ee5012e1bc7aa04c080bffe0296b77 100644 (file)
--- a/source4/kdc/kdc-glue.h
+++ b/source4/kdc/kdc-glue.h
@@ -29,28 +29,10 @@
 #include <kdc.h>
 #include <krb5/windc_plugin.h>
 #include "kdc/samba_kdc.h"
+#include "kdc/kdc-server.h"
 
 struct tsocket_address;
 
-/*
-  top level context structure for the kdc server
-*/
-struct kdc_server {
-       struct task_server *task;
-       struct smb_krb5_context *smb_krb5_context;
-       struct samba_kdc_base_context *base_ctx;
-       struct ldb_context *samdb;
-       bool am_rodc;
-       uint32_t proxy_timeout;
-       void *private_data;
-};
-
-typedef enum kdc_code_e {
-       KDC_OK = 0,
-       KDC_ERROR,
-       KDC_PROXY_REQUEST
-} kdc_code;
-
 kdc_code kpasswdd_process(struct kdc_server *kdc,
                          TALLOC_CTX *mem_ctx,
                          DATA_BLOB *input,

diff --git a/source4/kdc/kdc-heimdal.c b/source4/kdc/kdc-heimdal.c
index 2a190105dffcbf01d0a657a74e7b9e7c79b8aac3..c3d857a6cd188c40881d5fc891cc81c7329eba11 100644 (file)
--- a/source4/kdc/kdc-heimdal.c
+++ b/source4/kdc/kdc-heimdal.c
@@ -31,6 +31,7 @@
 #include "lib/stream/packet.h"
 #include "lib/socket/netif.h"
 #include "param/param.h"
+#include "kdc/kdc-server.h"
 #include "kdc/kdc-glue.h"
 #include "kdc/pac-glue.h"
 #include "dsdb/samdb/samdb.h"

diff --git a/source4/kdc/kdc-server.h b/source4/kdc/kdc-server.h
new file mode 100644 (file)
index 0000000..952235f
--- /dev/null
+++ b/source4/kdc/kdc-server.h
@@ -0,0 +1,50 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   KDC related functions
+
+   Copyright (c) 2005-2008 Andrew Bartlett <abartlet@samba.org>
+   Copyright (c) 2005             Andrew Tridgell <tridge@samba.org>
+   Copyright (c) 2005             Stefan Metzmacher <metze@samba.org>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _KDC_SERVER_H
+#define _KDC_SERVER_H
+
+#include "system/kerberos.h"
+
+struct tsocket_address;
+
+/*
+ * Context structure for the kdc server
+ */
+struct kdc_server {
+       struct task_server *task;
+       struct smb_krb5_context *smb_krb5_context;
+       struct samba_kdc_base_context *base_ctx;
+       struct ldb_context *samdb;
+       bool am_rodc;
+       uint32_t proxy_timeout;
+       void *private_data;
+};
+
+typedef enum kdc_code_e {
+       KDC_OK = 0,
+       KDC_ERROR,
+       KDC_PROXY_REQUEST
+} kdc_code;
+
+#endif /* _KDC_SERVER_H */

diff --git a/source4/kdc/kpasswd-heimdal.c b/source4/kdc/kpasswd-heimdal.c
index 6c499aa27c60564fa454ba3992351beedc10978b..e61dfd42a1694e3e5e11b4f083a4396f725d47dd 100644 (file)
--- a/source4/kdc/kpasswd-heimdal.c
+++ b/source4/kdc/kpasswd-heimdal.c
@@ -29,6 +29,7 @@
 #include "../lib/util/util_ldb.h"
 #include "libcli/security/security.h"
 #include "param/param.h"
+#include "kdc/kdc-server.h"
 #include "kdc/kdc-glue.h"
 #include "dsdb/common/util.h"
 #include "kdc/kpasswd_glue.h"

diff --git a/source4/kdc/proxy-heimdal.c b/source4/kdc/proxy-heimdal.c
index 324bfb8e2e1cececf8ec5025af43424da62d241e..aca85d7b81b87204b983b85459e34a94a786cef8 100644 (file)
--- a/source4/kdc/proxy-heimdal.c
+++ b/source4/kdc/proxy-heimdal.c
@@ -27,6 +27,7 @@
 #include "libcli/util/tstream.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "lib/stream/packet.h"
+#include "kdc/kdc-server.h"
 #include "kdc/kdc-glue.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/composite/composite.h"