summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-07-05 10:05:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:19:16 -0500
commit42bb490709f2ab2d569b53b8bd66dde4246711a4 (patch)
tree49926eb38c5ed95a911e916a6005999784afc29a
parenta3c7f79931098de0dca05ecee926c7ce97135878 (diff)
downloadsamba-42bb490709f2ab2d569b53b8bd66dde4246711a4.tar.gz
samba-42bb490709f2ab2d569b53b8bd66dde4246711a4.tar.bz2
samba-42bb490709f2ab2d569b53b8bd66dde4246711a4.zip
r8161: Update Samba4 for the new Heimdal update.
Andrew Bartlett (This used to be commit 6a9b6373273f135fe012a6603707d77c2a65e9fa)
-rw-r--r--source4/heimdal_build/config.m42
-rw-r--r--source4/heimdal_build/config.mk1
-rw-r--r--source4/include/system/kerberos.h2
-rw-r--r--source4/kdc/kdc.c2
-rw-r--r--source4/kdc/kdc.h2
5 files changed, 5 insertions, 4 deletions
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index b4aa1f65cb..18e491c30b 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -14,7 +14,7 @@ SMB_BINARY_ENABLE(compile_et, NO)
# of the samba source tree
if test -d heimdal; then
AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available])
- CFLAGS="${CFLAGS} -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/gssapi -Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/lib/hdb"
+ CFLAGS="${CFLAGS} -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/gssapi -Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/lib/hdb -Iheimdal/kdc"
HAVE_KRB5=YES
SMB_MODULE_DEFAULT(KERBEROS_LIB, STATIC)
SMB_BINARY_ENABLE(asn1_compile, YES)
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index a66ceea7b0..45b82672e4 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -285,6 +285,7 @@ ADD_OBJ_FILES = \
heimdal/lib/roken/strlwr.o \
heimdal/lib/roken/strsep_copy.o \
heimdal/lib/roken/strupr.o \
+ heimdal/lib/roken/strpool.o \
heimdal/lib/roken/getifaddrs.o
NOPROTO = YES
# End SUBSYSTEM HEIMDAL_ROKEN
diff --git a/source4/include/system/kerberos.h b/source4/include/system/kerberos.h
index 26afb36a48..d000f4d668 100644
--- a/source4/include/system/kerberos.h
+++ b/source4/include/system/kerberos.h
@@ -20,6 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifdef HAVE_KRB5
/* Whether the krb5_address struct has a addrtype property */
/* #undef HAVE_ADDRTYPE_IN_KRB5_ADDRESS */
/* Whether the krb5_address struct has a addr_type property */
@@ -123,7 +124,6 @@
/* Whether krb5_princ_realm returns krb5_realm or krb5_data */
#define KRB5_PRINC_REALM_RETURNS_REALM 1
-#ifdef HAVE_KRB5
#include "heimdal/lib/krb5/krb5.h"
#include "heimdal/lib/gssapi/gssapi.h"
#include "heimdal/lib/com_err/com_err.h"
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index a1958b54fa..1540e0f4a1 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -250,7 +250,7 @@ static void kdc_task_init(struct task_server *task)
kdc->task = task;
/* Setup the KDC configuration */
- kdc->config = talloc(kdc, struct krb5_kdc_configuration);
+ kdc->config = talloc(kdc, krb5_kdc_configuration);
if (!kdc->config) {
task_server_terminate(task, "kdc: out of memory");
return;
diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h
index d59fa3e2e7..2965adc8d2 100644
--- a/source4/kdc/kdc.h
+++ b/source4/kdc/kdc.h
@@ -42,7 +42,7 @@ struct kdc_reply {
*/
struct kdc_server {
struct task_server *task;
- struct krb5_kdc_configuration *config;
+ krb5_kdc_configuration *config;
struct smb_krb5_context *smb_krb5_context;
};