From e26609b667094dde09dbe3fcabdc2d26ded7f37c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 11 Nov 2010 14:09:41 +1100
Subject: [PATCH] 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.h => kdc-glue.h} | 0
 source4/kdc/kdc.c                 | 2 +-
 source4/kdc/kpasswdd.c            | 2 +-
 source4/kdc/pac-glue.c            | 2 +-
 source4/kdc/wdc-samba4.c          | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename source4/kdc/{kdc.h => kdc-glue.h} (100%)

diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index 3956ce2b156..596e73e0235 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.h b/source4/kdc/kdc-glue.h
similarity index 100%
rename from source4/kdc/kdc.h
rename to source4/kdc/kdc-glue.h
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index a4bab42920b..efcdc59db5e 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/kpasswdd.c b/source4/kdc/kpasswdd.c
index 5254b62384b..df945226606 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 c7e3876e80f..33b845d356d 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 89265946988..a6487110f70 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"