svn commit: samba r8161 - in branches/SAMBA_4_0/source: heimdal_build include/system kdc

[abartlet at samba.org]

Author: abartlet
Date: 2005-07-05 10:05:40 +0000 (Tue, 05 Jul 2005)
New Revision: 8161

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8161

Log:
Update Samba4 for the new Heimdal update.  

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.m4
   branches/SAMBA_4_0/source/heimdal_build/config.mk
   branches/SAMBA_4_0/source/include/system/kerberos.h
   branches/SAMBA_4_0/source/kdc/kdc.c
   branches/SAMBA_4_0/source/kdc/kdc.h


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.m4	2005-07-05 08:57:12 UTC (rev 8160)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4	2005-07-05 10:05:40 UTC (rev 8161)
@@ -14,7 +14,7 @@
 # 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)

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2005-07-05 08:57:12 UTC (rev 8160)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2005-07-05 10:05:40 UTC (rev 8161)
@@ -285,6 +285,7 @@
 	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

Modified: branches/SAMBA_4_0/source/include/system/kerberos.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/kerberos.h	2005-07-05 08:57:12 UTC (rev 8160)
+++ branches/SAMBA_4_0/source/include/system/kerberos.h	2005-07-05 10:05:40 UTC (rev 8161)
@@ -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"

Modified: branches/SAMBA_4_0/source/kdc/kdc.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/kdc.c	2005-07-05 08:57:12 UTC (rev 8160)
+++ branches/SAMBA_4_0/source/kdc/kdc.c	2005-07-05 10:05:40 UTC (rev 8161)
@@ -250,7 +250,7 @@
 	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;

Modified: branches/SAMBA_4_0/source/kdc/kdc.h
===================================================================
--- branches/SAMBA_4_0/source/kdc/kdc.h	2005-07-05 08:57:12 UTC (rev 8160)
+++ branches/SAMBA_4_0/source/kdc/kdc.h	2005-07-05 10:05:40 UTC (rev 8161)
@@ -42,7 +42,7 @@
 */
 struct kdc_server {
 	struct task_server *task;
-	struct krb5_kdc_configuration *config;
+	krb5_kdc_configuration *config;
 	struct smb_krb5_context *smb_krb5_context;
 };