svn commit: samba r19616 - in branches/SAMBA_4_0/source: heimdal/lib/gssapi/mech heimdal_build

[metze at samba.org]

Author: metze
Date: 2006-11-07 12:50:24 +0000 (Tue, 07 Nov 2006)
New Revision: 19616

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

Log:
the heimdal spnego mech doesn't seem to use roken.h and isn't portable
(it doesn't compile on suse 10.1 because gethostname() isn't found,
 unistd.h isn't included...)

as we don't need the spnego mech, disable it till it gets fixed in heimdal

metze
Modified:
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_mech_switch.c
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_mech_switch.c
===================================================================
--- branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_mech_switch.c	2006-11-07 12:47:46 UTC (rev 19615)
+++ branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_mech_switch.c	2006-11-07 12:50:24 UTC (rev 19616)
@@ -213,7 +213,9 @@
 	}
 
 	add_builtin(__gss_krb5_initialize());
+#ifndef _SAMBA_BUILD_
 	add_builtin(__gss_spnego_initialize());
+#endif
 
 	fp = fopen(_PATH_GSS_MECH, "r");
 	if (!fp) {

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-11-07 12:47:46 UTC (rev 19615)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-11-07 12:50:24 UTC (rev 19616)
@@ -122,18 +122,6 @@
 	../heimdal/lib/gssapi/mech/gss_release_name.o \
 	../heimdal/lib/gssapi/mech/gss_set_cred_option.o \
 	../heimdal/lib/gssapi/mech/asn1_GSSAPIContextToken.o \
-	../heimdal/lib/gssapi/spnego/init_sec_context.o \
-	../heimdal/lib/gssapi/spnego/external.o \
-	../heimdal/lib/gssapi/spnego/compat.o \
-	../heimdal/lib/gssapi/spnego/context_stubs.o \
-	../heimdal/lib/gssapi/spnego/cred_stubs.o \
-	../heimdal/lib/gssapi/spnego/accept_sec_context.o \
-	../heimdal/lib/gssapi/spnego/asn1_ContextFlags.o \
-	../heimdal/lib/gssapi/spnego/asn1_MechType.o \
-	../heimdal/lib/gssapi/spnego/asn1_MechTypeList.o \
-	../heimdal/lib/gssapi/spnego/asn1_NegHints.o \
-	../heimdal/lib/gssapi/spnego/asn1_NegTokenInit.o \
-	../heimdal/lib/gssapi/spnego/asn1_NegTokenResp.o \
 	../heimdal/lib/gssapi/krb5/copy_ccache.o \
 	../heimdal/lib/gssapi/krb5/delete_sec_context.o \
 	../heimdal/lib/gssapi/krb5/init_sec_context.o \