diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-06-04 15:39:17 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-06-04 15:39:17 +0200 |
| commit | 71ce9975fa06948d95b2bf9184dbef113813337a (patch) | |
| tree | 09e0c2ea7d781c951b7c1fafd6bf4519784e4386 | |
| parent | 869991385827d14f4e55729e4d56a80eccf9fdec (diff) | |
| download | samba-71ce9975fa06948d95b2bf9184dbef113813337a.tar.gz samba-71ce9975fa06948d95b2bf9184dbef113813337a.tar.bz2 samba-71ce9975fa06948d95b2bf9184dbef113813337a.zip | |
kdc: we don't need any *_locl.h header from heimdal in the kdc
metze
(This used to be commit feca16dd6d03730b4a67adf5d912ba2d5e1a3025)
| -rw-r--r-- | source4/kdc/hdb-ldb.c | 4 | ||||
| -rw-r--r-- | source4/kdc/kdc.c | 5 | ||||
| -rw-r--r-- | source4/kdc/kdc.h | 1 | ||||
| -rw-r--r-- | source4/kdc/kpasswdd.c | 2 | ||||
| -rw-r--r-- | source4/kdc/pac-glue.c | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c index 9c7b1f6457..70e578ee0d 100644 --- a/source4/kdc/hdb-ldb.c +++ b/source4/kdc/hdb-ldb.c @@ -34,10 +34,7 @@ #include "includes.h" #include "system/time.h" -#include "kdc.h" #include "dsdb/common/flags.h" -#include "hdb.h" -#include "krb5_locl.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "librpc/gen_ndr/netlogon.h" @@ -51,6 +48,7 @@ #include "libcli/auth/libcli_auth.h" #include "param/param.h" #include "events/events.h" +#include "kdc/kdc.h" enum hdb_ldb_ent_type { HDB_LDB_ENT_TYPE_CLIENT, HDB_LDB_ENT_TYPE_SERVER, diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index 84d9d45f57..dfd62c55a4 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -28,17 +28,14 @@ #include "smbd/process_model.h" #include "lib/events/events.h" #include "lib/socket/socket.h" -#include "kdc/kdc.h" #include "system/network.h" #include "lib/util/dlinklist.h" #include "lib/messaging/irpc.h" #include "lib/stream/packet.h" #include "librpc/gen_ndr/samr.h" #include "lib/socket/netif.h" -#include "heimdal/kdc/windc_plugin.h" -#include "heimdal/lib/krb5/krb5_locl.h" -#include "heimdal/kdc/kdc_locl.h" #include "param/param.h" +#include "kdc/kdc.h" /* Disgusting hack to get a mem_ctx and lp_ctx into the hdb plugin, when diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h index 9be15115d1..0943de4b00 100644 --- a/source4/kdc/kdc.h +++ b/source4/kdc/kdc.h @@ -24,6 +24,7 @@ #include "auth/kerberos/kerberos.h" #include "heimdal/kdc/kdc.h" #include "heimdal/lib/hdb/hdb.h" +#include "heimdal/kdc/windc_plugin.h" #include "kdc/pac_glue.h" struct kdc_server; diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c index 1d49a8a4bd..b42769c6dc 100644 --- a/source4/kdc/kpasswdd.c +++ b/source4/kdc/kpasswdd.c @@ -24,7 +24,6 @@ #include "smbd/service_task.h" #include "lib/events/events.h" #include "lib/socket/socket.h" -#include "kdc/kdc.h" #include "system/network.h" #include "lib/util/dlinklist.h" #include "lib/ldb/include/ldb.h" @@ -39,6 +38,7 @@ #include "rpc_server/samr/proto.h" #include "libcli/security/security.h" #include "param/param.h" +#include "kdc/kdc.h" /* hold information about one kdc socket */ struct kpasswd_socket { diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c index 1c68d4c37d..cab1446ff3 100644 --- a/source4/kdc/pac-glue.c +++ b/source4/kdc/pac-glue.c @@ -21,7 +21,6 @@ */ #include "includes.h" -#include "kdc/kdc.h" #include "dsdb/common/flags.h" #include "lib/ldb/include/ldb.h" #include "librpc/gen_ndr/ndr_krb5pac.h" @@ -30,6 +29,7 @@ #include "auth/auth_sam.h" #include "auth/auth_sam_reply.h" #include "param/param.h" +#include "kdc/kdc.h" struct krb5_dh_moduli; struct _krb5_krb_auth_data; |