s4-kdc: rename kdc/kdc.h to kdc/kdc-glue.h

kdc.h conflicts with a heimdal header name

diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index 3956ce2b1560204b2f3aa3e132efa18c639dad4d..596e73e0235c8cdbd654fc29c7625c0c57442931 100644 (file)
--- 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 a4bab42920b393a0549ed31123ac4ab227b36440..efcdc59db5ecf6784b8d1c415e358d9a39ca588b 100644 (file)
--- 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 5254b62384bfc5624a711f1a424498da83477ef9..df94522660669c790f877ce39170edecde4bc66a 100644 (file)
--- 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 c7e3876e80f54f1c76cb156f862d37ab22f31f7c..33b845d356de9ef232efff880b3cf9c8bb6b2d19 100644 (file)
--- 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 89265946988365bcb4e3272c08552fcba7450df6..a6487110f70d09c76c5ef0dc2a3f9f1a4e523d4f 100644 (file)
--- 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"