diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-11 14:09:41 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-12 18:18:55 +1100 |
| commit | e26609b667094dde09dbe3fcabdc2d26ded7f37c (patch) | |
| tree | a0cb99a94037730662fb3273f183352a4fcfccb2 /source4/kdc | |
| parent | dcd346c0e541246260507c96283eefaef23edebb (diff) | |
| download | samba-e26609b667094dde09dbe3fcabdc2d26ded7f37c.tar.gz samba-e26609b667094dde09dbe3fcabdc2d26ded7f37c.tar.bz2 samba-e26609b667094dde09dbe3fcabdc2d26ded7f37c.zip | |
s4-kdc: rename kdc/kdc.h to kdc/kdc-glue.h
kdc.h conflicts with a heimdal header name
Diffstat (limited to 'source4/kdc')
| -rw-r--r-- | source4/kdc/hdb-samba4.c | 2 | ||||
| -rw-r--r-- | source4/kdc/kdc-glue.h (renamed from source4/kdc/kdc.h) | 0 | ||||
| -rw-r--r-- | source4/kdc/kdc.c | 2 | ||||
| -rw-r--r-- | source4/kdc/kpasswdd.c | 2 | ||||
| -rw-r--r-- | source4/kdc/pac-glue.c | 2 | ||||
| -rw-r--r-- | source4/kdc/wdc-samba4.c | 2 |
6 files changed, 5 insertions, 5 deletions
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.h b/source4/kdc/kdc-glue.h index 6a2df1bc2c..6a2df1bc2c 100644 --- a/source4/kdc/kdc.h +++ b/source4/kdc/kdc-glue.h 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/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" |