From e26609b667094dde09dbe3fcabdc2d26ded7f37c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 11 Nov 2010 14:09:41 +1100 Subject: s4-kdc: rename kdc/kdc.h to kdc/kdc-glue.h kdc.h conflicts with a heimdal header name --- source4/kdc/hdb-samba4.c | 2 +- source4/kdc/kdc-glue.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ source4/kdc/kdc.c | 2 +- source4/kdc/kdc.h | 57 ------------------------------------------------ source4/kdc/kpasswdd.c | 2 +- source4/kdc/pac-glue.c | 2 +- source4/kdc/wdc-samba4.c | 2 +- 7 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 source4/kdc/kdc-glue.h delete mode 100644 source4/kdc/kdc.h (limited to 'source4/kdc') diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c index 3956ce2b15..596e73e023 100644 --- a/source4/kdc/hdb-samba4.c +++ b/source4/kdc/hdb-samba4.c @@ -37,7 +37,7 @@ #include "auth/credentials/credentials.h" #include "dsdb/samdb/samdb.h" #include "param/param.h" -#include "kdc/kdc.h" +#include "kdc/kdc-glue.h" #include "kdc/db-glue.h" static krb5_error_code hdb_samba4_open(krb5_context context, HDB *db, int flags, mode_t mode) diff --git a/source4/kdc/kdc-glue.h b/source4/kdc/kdc-glue.h new file mode 100644 index 0000000000..6a2df1bc2c --- /dev/null +++ b/source4/kdc/kdc-glue.h @@ -0,0 +1,57 @@ +/* + Unix SMB/CIFS implementation. + + KDC structures + + Copyright (C) Andrew Tridgell 2005 + Copyright (C) Andrew Bartlett 2005 + + 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 . +*/ + +#ifndef _KDC_KDC_H +#define _KDC_KDC_H + +#include "system/kerberos.h" +#include "auth/kerberos/kerberos.h" +#include +#include +#include +#include "kdc/samba_kdc.h" + +struct tsocket_address; + +/* + top level context structure for the kdc server +*/ +struct kdc_server { + struct task_server *task; + krb5_kdc_configuration *config; + struct smb_krb5_context *smb_krb5_context; + struct samba_kdc_base_context *base_ctx; +}; + +bool kpasswdd_process(struct kdc_server *kdc, + TALLOC_CTX *mem_ctx, + DATA_BLOB *input, + DATA_BLOB *reply, + struct tsocket_address *peer_addr, + struct tsocket_address *my_addr, + int datagram_reply); + +/* from hdb-samba4.c */ +NTSTATUS hdb_samba4_create_kdc(struct samba_kdc_base_context *base_ctx, + krb5_context context, struct HDB **db); + +#endif diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index a4bab42920..efcdc59db5 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -39,7 +39,7 @@ #include "librpc/gen_ndr/ndr_krb5pac.h" #include "lib/socket/netif.h" #include "param/param.h" -#include "kdc/kdc.h" +#include "kdc/kdc-glue.h" #include "librpc/gen_ndr/ndr_misc.h" diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h deleted file mode 100644 index 6a2df1bc2c..0000000000 --- a/source4/kdc/kdc.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - KDC structures - - Copyright (C) Andrew Tridgell 2005 - Copyright (C) Andrew Bartlett 2005 - - 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 . -*/ - -#ifndef _KDC_KDC_H -#define _KDC_KDC_H - -#include "system/kerberos.h" -#include "auth/kerberos/kerberos.h" -#include -#include -#include -#include "kdc/samba_kdc.h" - -struct tsocket_address; - -/* - top level context structure for the kdc server -*/ -struct kdc_server { - struct task_server *task; - krb5_kdc_configuration *config; - struct smb_krb5_context *smb_krb5_context; - struct samba_kdc_base_context *base_ctx; -}; - -bool kpasswdd_process(struct kdc_server *kdc, - TALLOC_CTX *mem_ctx, - DATA_BLOB *input, - DATA_BLOB *reply, - struct tsocket_address *peer_addr, - struct tsocket_address *my_addr, - int datagram_reply); - -/* from hdb-samba4.c */ -NTSTATUS hdb_samba4_create_kdc(struct samba_kdc_base_context *base_ctx, - krb5_context context, struct HDB **db); - -#endif diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c index 5254b62384..df94522660 100644 --- a/source4/kdc/kpasswdd.c +++ b/source4/kdc/kpasswdd.c @@ -38,7 +38,7 @@ #include "rpc_server/samr/proto.h" #include "libcli/security/security.h" #include "param/param.h" -#include "kdc/kdc.h" +#include "kdc/kdc-glue.h" /* TODO: remove all SAMBA4_INTERNAL_HEIMDAL stuff from this file */ #ifdef SAMBA4_INTERNAL_HEIMDAL diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c index c7e3876e80..33b845d356 100644 --- a/source4/kdc/pac-glue.c +++ b/source4/kdc/pac-glue.c @@ -29,7 +29,7 @@ #include "auth/auth.h" #include "auth/auth_sam.h" #include "auth/auth_sam_reply.h" -#include "kdc/kdc.h" +#include "kdc/kdc-glue.h" #include "param/param.h" static diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c index 8926594698..a6487110f7 100644 --- a/source4/kdc/wdc-samba4.c +++ b/source4/kdc/wdc-samba4.c @@ -24,7 +24,7 @@ #include "includes.h" #include "../libds/common/flags.h" #include "auth/auth.h" -#include "kdc/kdc.h" +#include "kdc/kdc-glue.h" #include "param/param.h" #include "kdc/pac-glue.h" -- cgit