summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2010-01-21 09:57:41 -0500
committerSimo Sorce <idra@samba.org>2010-01-22 11:16:24 -0500
commit4c548048c55ab3b7c79f5317281988b446c7fbf2 (patch)
tree670bde79103394c37d68c5468133f577d837d4f0 /source4
parent9acbed13e877cb4cf69c93598d89cb865aa7f194 (diff)
downloadsamba-4c548048c55ab3b7c79f5317281988b446c7fbf2.tar.gz
samba-4c548048c55ab3b7c79f5317281988b446c7fbf2.tar.bz2
samba-4c548048c55ab3b7c79f5317281988b446c7fbf2.zip
s4:kdc Simplify header files
Diffstat (limited to 'source4')
-rw-r--r--source4/kdc/config.mk1
-rw-r--r--source4/kdc/hdb-samba4.c14
-rw-r--r--source4/kdc/kdc.h8
-rw-r--r--source4/kdc/pac-glue.h30
4 files changed, 14 insertions, 39 deletions
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index 3ae5fe5921..16599414df 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -36,4 +36,3 @@ PRIVATE_DEPENDENCIES = \
#######################
PAC_GLUE_OBJ_FILES = $(addprefix $(kdcsrcdir)/, pac-glue.o)
-$(eval $(call proto_header_template,$(kdcsrcdir)/pac-glue_proto.h,$(HDB_SAMBA4_OBJ_FILES:.o=.c)))
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index f7a72b41bc..eb7edeb5c8 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -1451,9 +1451,10 @@ static krb5_error_code hdb_samba4_destroy(krb5_context context, HDB *db)
*
* This is currently a very nasty hack - allowing only delegation to itself.
*/
-krb5_error_code hdb_samba4_check_constrained_delegation(krb5_context context, HDB *db,
- hdb_entry_ex *entry,
- krb5_const_principal target_principal)
+static krb5_error_code
+hdb_samba4_check_constrained_delegation(krb5_context context, HDB *db,
+ hdb_entry_ex *entry,
+ krb5_const_principal target_principal)
{
struct ldb_context *ldb_ctx = (struct ldb_context *)db->hdb_db;
struct loadparm_context *lp_ctx = talloc_get_type(ldb_get_opaque(ldb_ctx, "loadparm"),
@@ -1525,9 +1526,10 @@ krb5_error_code hdb_samba4_check_constrained_delegation(krb5_context context, HD
* database. Allow a mismatch where they both refer to the same
* SID */
-krb5_error_code hdb_samba4_check_pkinit_ms_upn_match(krb5_context context, HDB *db,
- hdb_entry_ex *entry,
- krb5_const_principal certificate_principal)
+static krb5_error_code
+hdb_samba4_check_pkinit_ms_upn_match(krb5_context context, HDB *db,
+ hdb_entry_ex *entry,
+ krb5_const_principal certificate_principal)
{
struct ldb_context *ldb_ctx = (struct ldb_context *)db->hdb_db;
struct loadparm_context *lp_ctx = talloc_get_type(ldb_get_opaque(ldb_ctx, "loadparm"),
diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h
index b9cf621537..becef93ad7 100644
--- a/source4/kdc/kdc.h
+++ b/source4/kdc/kdc.h
@@ -25,12 +25,12 @@
#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 tsocket_address;
+extern struct krb5plugin_windc_ftable windc_plugin_table;
bool kpasswdd_process(struct kdc_server *kdc,
TALLOC_CTX *mem_ctx,
@@ -50,4 +50,8 @@ struct kdc_server {
struct hdb_samba4_context *hdb_samba4_context;
};
-
+/* from hdb-samba4.c */
+NTSTATUS hdb_samba4_create_kdc(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev_ctx,
+ struct loadparm_context *lp_ctx,
+ krb5_context context, struct HDB **db);
diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
deleted file mode 100644
index f838ec353a..0000000000
--- a/source4/kdc/pac-glue.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- KDC Server startup
-
- Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005-2009
-
- 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_PAC_GLUE_H__
-#define __KDC_PAC_GLUE_H__
-
-#include "kdc/pac-glue_proto.h"
-
-extern struct krb5plugin_windc_ftable windc_plugin_table;
-
-#endif /* __KDC_PAC_GLUE_H__ */
-