[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha4-19-gfeca16d
Stefan Metzmacher
metze at samba.org
Wed Jun 4 13:44:18 GMT 2008
The branch, v4-0-test has been updated
via feca16dd6d03730b4a67adf5d912ba2d5e1a3025 (commit)
from 2c8904be3bac2c696712cc3160fe95d62afde43a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit feca16dd6d03730b4a67adf5d912ba2d5e1a3025
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jun 4 15:39:17 2008 +0200
kdc: we don't need any *_locl.h header from heimdal in the kdc
metze
-----------------------------------------------------------------------
Summary of changes:
source/kdc/hdb-ldb.c | 4 +---
source/kdc/kdc.c | 5 +----
source/kdc/kdc.h | 1 +
source/kdc/kpasswdd.c | 2 +-
source/kdc/pac-glue.c | 2 +-
5 files changed, 5 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/kdc/hdb-ldb.c b/source/kdc/hdb-ldb.c
index 9c7b1f6..70e578e 100644
--- a/source/kdc/hdb-ldb.c
+++ b/source/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/source/kdc/kdc.c b/source/kdc/kdc.c
index 84d9d45..dfd62c5 100644
--- a/source/kdc/kdc.c
+++ b/source/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/source/kdc/kdc.h b/source/kdc/kdc.h
index 9be1511..0943de4 100644
--- a/source/kdc/kdc.h
+++ b/source/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/source/kdc/kpasswdd.c b/source/kdc/kpasswdd.c
index 1d49a8a..b42769c 100644
--- a/source/kdc/kpasswdd.c
+++ b/source/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/source/kdc/pac-glue.c b/source/kdc/pac-glue.c
index 1c68d4c..cab1446 100644
--- a/source/kdc/pac-glue.c
+++ b/source/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;
--
Samba Shared Repository
More information about the samba-cvs
mailing list