summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-08-01 17:24:24 +0200
committerStefan Metzmacher <metze@samba.org>2008-08-01 17:54:34 +0200
commitf2ac351d6ef8d240f9e45f4df58b022052457d76 (patch)
treed3dd6ee15fe4f6bd03a9d43be16c98d543633666
parent9cc663af6e234e1938ac6a4cfce6b72b837440e5 (diff)
downloadsamba-f2ac351d6ef8d240f9e45f4df58b022052457d76.tar.gz
samba-f2ac351d6ef8d240f9e45f4df58b022052457d76.tar.bz2
samba-f2ac351d6ef8d240f9e45f4df58b022052457d76.zip
kdc: use mostly only public kerberos headers
We shoule avoid using the private heimdal function _krb5_principalname2krb5_principal() metze (This used to be commit 10db07c69addce6e90851fb55738d5f9e142946b)
-rw-r--r--source4/heimdal_build/krb5/windc_plugin.h1
-rw-r--r--source4/kdc/config.mk6
-rw-r--r--source4/kdc/kdc.h6
-rw-r--r--source4/kdc/kpasswdd.c6
4 files changed, 11 insertions, 8 deletions
diff --git a/source4/heimdal_build/krb5/windc_plugin.h b/source4/heimdal_build/krb5/windc_plugin.h
new file mode 100644
index 0000000000..1df5fd3eb6
--- /dev/null
+++ b/source4/heimdal_build/krb5/windc_plugin.h
@@ -0,0 +1 @@
+#include "heimdal/kdc/windc_plugin.h"
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index b3b8b216f0..2c96e22cb3 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -6,7 +6,7 @@
INIT_FUNCTION = server_service_kdc_init
SUBSYSTEM = smbd
PRIVATE_DEPENDENCIES = \
- LIBLDB HEIMDAL HEIMDAL_KDC HEIMDAL_HDB SAMDB
+ HEIMDAL_KDC HDB_LDB
# End SUBSYSTEM KDC
#######################
@@ -17,8 +17,8 @@ KDC_OBJ_FILES = $(addprefix $(kdcsrcdir)/, kdc.o kpasswdd.o)
[SUBSYSTEM::HDB_LDB]
CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
PRIVATE_DEPENDENCIES = \
- LIBLDB auth_sam auth_sam_reply HEIMDAL CREDENTIALS \
- HEIMDAL_HDB_ASN1
+ LIBLDB auth_sam auth_sam_reply CREDENTIALS \
+ HEIMDAL_HDB
# End SUBSYSTEM KDC
#######################
diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h
index 0943de4b00..7e82ad24c4 100644
--- a/source4/kdc/kdc.h
+++ b/source4/kdc/kdc.h
@@ -22,9 +22,9 @@
#include "system/kerberos.h"
#include "auth/kerberos/kerberos.h"
-#include "heimdal/kdc/kdc.h"
-#include "heimdal/lib/hdb/hdb.h"
-#include "heimdal/kdc/windc_plugin.h"
+#include <kdc.h>
+#include <hdb.h>
+#include <krb5/windc_plugin.h>
#include "kdc/pac_glue.h"
struct kdc_server;
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index b42769c6dc..55dadd9a7e 100644
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -27,8 +27,6 @@
#include "system/network.h"
#include "lib/util/dlinklist.h"
#include "lib/ldb/include/ldb.h"
-#include "heimdal/lib/krb5/krb5_locl.h"
-#include "heimdal/lib/krb5/krb5-private.h"
#include "auth/gensec/gensec.h"
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
@@ -40,6 +38,10 @@
#include "param/param.h"
#include "kdc/kdc.h"
+/* TODO: remove this */
+#include "heimdal/lib/krb5/krb5_locl.h"
+#include "heimdal/lib/krb5/krb5-private.h"
+
/* hold information about one kdc socket */
struct kpasswd_socket {
struct socket_context *sock;